diff --git a/build.gradle b/build.gradle
index 93680fcfe..e9916adb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,7 +82,11 @@ allprojects {
       testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
       testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     }
+}
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
 }
+
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerLog4J.java b/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerLog4J.java
deleted file mode 100644
index 4f17bf536..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerLog4J.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2017 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.netflix.priam.tuner.dse;
-
-import com.google.common.base.Joiner;
-import com.google.common.io.Files;
-import com.netflix.priam.config.IConfiguration;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.List;
-import javax.inject.Inject;
-import org.apache.cassandra.io.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dse tuner for audit log via log4j. Use this instead of AuditLogTunerYaml if you are on DSE
- * version 3.x. Created by aagrawal on 8/8/17.
- */
-public class AuditLogTunerLog4J implements IAuditLogTuner {
-
-    private final IConfiguration config;
-    private final IDseConfiguration dseConfig;
-    protected static final String AUDIT_LOG_ADDITIVE_ENTRY = "log4j.additivity.DataAudit";
-    protected static final String AUDIT_LOG_FILE = "/conf/log4j-server.properties";
-    protected static final String PRIMARY_AUDIT_LOG_ENTRY = "log4j.logger.DataAudit";
-    private static final Logger logger = LoggerFactory.getLogger(AuditLogTunerLog4J.class);
-
-    @Inject
-    public AuditLogTunerLog4J(IConfiguration config, IDseConfiguration dseConfig) {
-        this.config = config;
-        this.dseConfig = dseConfig;
-    }
-
-    /**
-     * Note: supporting the direct hacking of a log4j props file is far from elegant, but seems less
-     * odious than other solutions I've come up with. Operates under the assumption that the only
-     * people mucking with the audit log entries in the value are DataStax themselves and this
-     * program, and that the original property names are somehow still preserved. Otherwise, YMMV.
-     */
-    public void tuneAuditLog() {
-        BufferedWriter writer = null;
-        try {
-            final File srcFile = new File(config.getCassHome() + AUDIT_LOG_FILE);
-            final List<String> lines = Files.readLines(srcFile, Charset.defaultCharset());
-            final File backupFile =
-                    new File(
-                            config.getCassHome()
-                                    + AUDIT_LOG_FILE
-                                    + "."
-                                    + System.currentTimeMillis());
-            Files.move(srcFile, backupFile);
-            writer = Files.newWriter(srcFile, Charset.defaultCharset());
-
-            String loggerPrefix = "log4j.appender.";
-            try {
-                loggerPrefix += findAuditLoggerName(lines);
-            } catch (IllegalStateException ise) {
-                logger.warn(
-                        "cannot locate "
-                                + PRIMARY_AUDIT_LOG_ENTRY
-                                + " property, will ignore any audit log updating");
-                return;
-            }
-
-            for (String line : lines) {
-                if (line.contains(loggerPrefix)
-                        || line.contains(PRIMARY_AUDIT_LOG_ENTRY)
-                        || line.contains(AUDIT_LOG_ADDITIVE_ENTRY)) {
-                    if (dseConfig.isAuditLogEnabled()) {
-                        // first, check to see if we need to uncomment the line
-                        while (line.startsWith("#")) {
-                            line = line.substring(1);
-                        }
-
-                        // next, check if we need to change the prop's value
-                        if (line.contains("ActiveCategories")) {
-                            final String cats =
-                                    Joiner.on(",").join(dseConfig.getAuditLogCategories());
-                            line = line.substring(0, line.indexOf("=") + 1).concat(cats);
-                        } else if (line.contains("ExemptKeyspaces")) {
-                            line =
-                                    line.substring(0, line.indexOf("=") + 1)
-                                            .concat(dseConfig.getAuditLogExemptKeyspaces());
-                        }
-                    } else {
-                        if (line.startsWith("#")) {
-                            // make sure there's only one # at the beginning of the line
-                            while (line.charAt(1) == '#') line = line.substring(1);
-                        } else {
-                            line = "#" + line;
-                        }
-                    }
-                }
-                writer.append(line);
-                writer.newLine();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("Unable to read " + AUDIT_LOG_FILE, e);
-
-        } finally {
-            FileUtils.closeQuietly(writer);
-        }
-    }
-
-    private String findAuditLoggerName(List<String> lines) throws IllegalStateException {
-        for (final String l : lines) {
-            if (l.contains(PRIMARY_AUDIT_LOG_ENTRY)) {
-                final String[] valTokens = l.split(",");
-                return valTokens[valTokens.length - 1].trim();
-            }
-        }
-        throw new IllegalStateException();
-    }
-}
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerYaml.java b/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerYaml.java
deleted file mode 100644
index 727d307c8..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/AuditLogTunerYaml.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2017 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.netflix.priam.tuner.dse;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Map;
-import javax.inject.Inject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-/** Dse tuner for audit log via YAML. Use this for DSE version 4.x Created by aagrawal on 8/8/17. */
-public class AuditLogTunerYaml implements IAuditLogTuner {
-
-    private final IDseConfiguration dseConfig;
-    private static final String AUDIT_LOG_DSE_ENTRY = "audit_logging_options";
-    private static final Logger logger = LoggerFactory.getLogger(AuditLogTunerYaml.class);
-
-    @Inject
-    public AuditLogTunerYaml(IDseConfiguration dseConfig) {
-        this.dseConfig = dseConfig;
-    }
-
-    public void tuneAuditLog() {
-        DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        Yaml yaml = new Yaml(options);
-        String dseYaml = dseConfig.getDseYamlLocation();
-        try {
-            Map<String, Object> map = yaml.load(new FileInputStream(dseYaml));
-
-            if (map.containsKey(AUDIT_LOG_DSE_ENTRY)) {
-                Boolean isEnabled =
-                        (Boolean)
-                                ((Map<String, Object>) map.get(AUDIT_LOG_DSE_ENTRY)).get("enabled");
-
-                // Enable/disable audit logging (need this in addition to log4j-server.properties
-                // settings)
-                if (dseConfig.isAuditLogEnabled()) {
-                    if (!isEnabled) {
-                        ((Map<String, Object>) map.get(AUDIT_LOG_DSE_ENTRY)).put("enabled", true);
-                    }
-                } else if (isEnabled) {
-                    ((Map<String, Object>) map.get(AUDIT_LOG_DSE_ENTRY)).put("enabled", false);
-                }
-            }
-
-            if (logger.isInfoEnabled()) {
-                logger.info("Updating dse-yaml:\n" + yaml.dump(map));
-            }
-            yaml.dump(map, new FileWriter(dseYaml));
-        } catch (FileNotFoundException fileNotFound) {
-            logger.error(
-                    "FileNotFound while trying to read yaml audit log for tuning: {}", dseYaml);
-        } catch (IOException e) {
-            logger.error(
-                    "IOException while trying to write yaml file for audit log tuning: {}",
-                    dseYaml);
-        }
-    }
-}
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/DseProcessManager.java b/priam/src/main/java/com/netflix/priam/tuner/dse/DseProcessManager.java
deleted file mode 100644
index 17fc2e2b9..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/DseProcessManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright 2017 Netflix, Inc.
- *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
- *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.netflix.priam.tuner.dse;
-
-import com.netflix.priam.config.IConfiguration;
-import com.netflix.priam.defaultimpl.CassandraProcessManager;
-import com.netflix.priam.health.InstanceState;
-import com.netflix.priam.merics.CassMonitorMetrics;
-import com.netflix.priam.tuner.dse.IDseConfiguration.NodeType;
-import java.util.Map;
-import javax.inject.Inject;
-
-public class DseProcessManager extends CassandraProcessManager {
-    private final IDseConfiguration dseConfig;
-
-    @Inject
-    public DseProcessManager(
-            IConfiguration config,
-            IDseConfiguration dseConfig,
-            InstanceState instanceState,
-            CassMonitorMetrics cassMonitorMetrics) {
-        super(config, instanceState, cassMonitorMetrics);
-        this.dseConfig = dseConfig;
-    }
-
-    protected void setEnv(Map<String, String> env) {
-        super.setEnv(env);
-
-        NodeType nodeType = dseConfig.getNodeType();
-        if (nodeType == NodeType.ANALYTIC_HADOOP) env.put("CLUSTER_TYPE", "-t");
-        else if (nodeType == NodeType.ANALYTIC_SPARK) env.put("CLUSTER_TYPE", "-k");
-        else if (nodeType == NodeType.ANALYTIC_HADOOP_SPARK) env.put("CLUSTER_TYPE", "-k -t");
-        else if (nodeType == NodeType.SEARCH) env.put("CLUSTER_TYPE", "-s");
-    }
-}
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/DseTuner.java b/priam/src/main/java/com/netflix/priam/tuner/dse/DseTuner.java
deleted file mode 100644
index 4b7216930..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/DseTuner.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2017 Netflix, Inc.
- *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
- *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.netflix.priam.tuner.dse;
-
-import static com.netflix.priam.tuner.dse.IDseConfiguration.NodeType;
-import static org.apache.cassandra.locator.SnitchProperties.RACKDC_PROPERTY_FILENAME;
-
-import com.netflix.priam.config.IBackupRestoreConfig;
-import com.netflix.priam.config.IConfiguration;
-import com.netflix.priam.identity.config.InstanceInfo;
-import com.netflix.priam.tuner.StandardTuner;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.Reader;
-import java.util.Properties;
-import javax.inject.Inject;
-import org.apache.cassandra.io.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Makes Datastax Enterprise-specific changes to the c* yaml and dse-yaml.
- *
- * @author jason brown
- * @author minh do
- */
-public class DseTuner extends StandardTuner {
-    private static final Logger logger = LoggerFactory.getLogger(DseTuner.class);
-    private final IDseConfiguration dseConfig;
-    private final IAuditLogTuner auditLogTuner;
-
-    @Inject
-    public DseTuner(
-            IConfiguration config,
-            IBackupRestoreConfig backupRestoreConfig,
-            IDseConfiguration dseConfig,
-            IAuditLogTuner auditLogTuner,
-            InstanceInfo instanceInfo) {
-        super(config, backupRestoreConfig, instanceInfo);
-        this.dseConfig = dseConfig;
-        this.auditLogTuner = auditLogTuner;
-    }
-
-    public void writeAllProperties(String yamlLocation, String hostname, String seedProvider)
-            throws Exception {
-        super.writeAllProperties(yamlLocation, hostname, seedProvider);
-        writeCassandraSnitchProperties();
-        auditLogTuner.tuneAuditLog();
-    }
-
-    private void writeCassandraSnitchProperties() {
-        final NodeType nodeType = dseConfig.getNodeType();
-        if (nodeType == NodeType.REAL_TIME_QUERY) return;
-
-        Reader reader = null;
-        try {
-            String filePath = config.getCassHome() + "/conf/" + RACKDC_PROPERTY_FILENAME;
-            reader = new FileReader(filePath);
-            Properties properties = new Properties();
-            properties.load(reader);
-            String suffix = "";
-            if (nodeType == NodeType.SEARCH) suffix = "_solr";
-            if (nodeType == NodeType.ANALYTIC_HADOOP) suffix = "_hadoop";
-            if (nodeType == NodeType.ANALYTIC_HADOOP_SPARK) suffix = "_hadoop_spark";
-            if (nodeType == NodeType.ANALYTIC_SPARK) suffix = "_spark";
-
-            properties.put("dc_suffix", suffix);
-            properties.store(new FileWriter(filePath), "");
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to read " + RACKDC_PROPERTY_FILENAME, e);
-        } finally {
-            FileUtils.closeQuietly(reader);
-        }
-    }
-
-    protected String getSnitch() {
-        return dseConfig.getDseDelegatingSnitch();
-    }
-}
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/IAuditLogTuner.java b/priam/src/main/java/com/netflix/priam/tuner/dse/IAuditLogTuner.java
deleted file mode 100644
index 909238273..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/IAuditLogTuner.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.netflix.priam.tuner.dse;
-
-import com.google.inject.ImplementedBy;
-
-/**
- * This is intended for tuning audit log settings. Audit log settings file change between cassandra
- * version from log4j to yaml. Created by aagrawal on 8/8/17.
- */
-@ImplementedBy(AuditLogTunerYaml.class)
-interface IAuditLogTuner {
-    void tuneAuditLog();
-}
diff --git a/priam/src/main/java/com/netflix/priam/tuner/dse/IDseConfiguration.java b/priam/src/main/java/com/netflix/priam/tuner/dse/IDseConfiguration.java
deleted file mode 100644
index 3c6de287f..000000000
--- a/priam/src/main/java/com/netflix/priam/tuner/dse/IDseConfiguration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright 2017 Netflix, Inc.
- *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
- *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.netflix.priam.tuner.dse;
-
-import java.util.Set;
-
-/**
- * Datastax Enterprise-specific properties.
- *
- * @author jason brown
- */
-public interface IDseConfiguration {
-    /** Using Datastax's terms here for the different types of nodes. */
-    enum NodeType {
-        /** vanilla Cassandra node */
-        REAL_TIME_QUERY("cassandra"),
-
-        /** Hadoop node */
-        ANALYTIC_HADOOP("hadoop"),
-
-        /** Spark node */
-        ANALYTIC_SPARK("spark"),
-
-        /** Hadoop and Spark node */
-        ANALYTIC_HADOOP_SPARK("hadoop-spark"),
-
-        /** Solr node */
-        SEARCH("solr");
-
-        private final String altName;
-
-        NodeType(String altName) {
-            this.altName = altName;
-        }
-
-        public static NodeType getByAltName(String altName) {
-            for (NodeType nt : NodeType.values()) {
-                if (nt.altName.toLowerCase().equals(altName)) return nt;
-            }
-            throw new IllegalArgumentException("Unknown node type: " + altName);
-        }
-    }
-
-    String getDseYamlLocation();
-
-    String getDseDelegatingSnitch();
-
-    NodeType getNodeType();
-
-    /* audit log configuration */
-
-    boolean isAuditLogEnabled();
-
-    /** @return comma-delimited list of keyspace names */
-    String getAuditLogExemptKeyspaces();
-
-    /**
-     * DSE-defined audit logging categories
-     * http://www.datastax.com/docs/datastax_enterprise3.1/security/data_auditing#data-auditing
-     */
-    enum AuditLogCategory {
-        ADMIN,
-        ALL,
-        AUTH,
-        DML,
-        DDL,
-        DCL,
-        QUERY
-    }
-
-    Set<AuditLogCategory> getAuditLogCategories();
-}
diff --git a/priam/src/test/java/com/netflix/priam/health/TestCassandraMonitor.java b/priam/src/test/java/com/netflix/priam/health/TestCassandraMonitor.java
deleted file mode 100644
index 4bf3fa61c..000000000
--- a/priam/src/test/java/com/netflix/priam/health/TestCassandraMonitor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2019 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.netflix.priam.health;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.netflix.priam.backup.BRTestModule;
-import com.netflix.priam.config.IConfiguration;
-import com.netflix.priam.connection.JMXNodeTool;
-import com.netflix.priam.defaultimpl.ICassandraProcess;
-import com.netflix.priam.merics.CassMonitorMetrics;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import mockit.*;
-import org.apache.cassandra.tools.NodeProbe;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/** Created by aagrawal on 7/18/17. */
-public class TestCassandraMonitor {
-    private static CassandraMonitor monitor;
-    private static InstanceState instanceState;
-    private static CassMonitorMetrics cassMonitorMetrics;
-
-    private IConfiguration config;
-
-    @Mocked private Process mockProcess;
-    @Mocked private NodeProbe nodeProbe;
-    @Mocked private ICassandraProcess cassProcess;
-
-    @Before
-    public void setUp() {
-        Injector injector = Guice.createInjector(new BRTestModule());
-        config = injector.getInstance(IConfiguration.class);
-        if (instanceState == null) instanceState = injector.getInstance(InstanceState.class);
-
-        if (cassMonitorMetrics == null)
-            cassMonitorMetrics = injector.getInstance(CassMonitorMetrics.class);
-
-        if (monitor == null)
-            monitor = new CassandraMonitor(config, instanceState, cassProcess, cassMonitorMetrics);
-    }
-
-    @Test
-    public void testCassandraMonitor() throws Exception {
-        monitor.execute();
-
-        Assert.assertFalse(CassandraMonitor.hasCassadraStarted());
-
-        CassandraMonitor.setIsCassadraStarted();
-        Assert.assertTrue(CassandraMonitor.hasCassadraStarted());
-
-        monitor.execute();
-        Assert.assertFalse(CassandraMonitor.hasCassadraStarted());
-    }
-
-    @Test
-    public void testNoAutoRemediation() throws Exception {
-        new MockUp<JMXNodeTool>() {
-            @Mock
-            NodeProbe instance(IConfiguration config) {
-                return nodeProbe;
-            }
-        };
-        final InputStream mockOutput = new ByteArrayInputStream("a process".getBytes());
-        new Expectations() {
-            {
-                mockProcess.getInputStream();
-                result = mockOutput;
-                nodeProbe.isGossipRunning();
-                result = true;
-                nodeProbe.isNativeTransportRunning();
-                result = true;
-            }
-        };
-        // Mock out the ps call
-        final Runtime r = Runtime.getRuntime();
-        String[] cmd = {
-            "/bin/sh",
-            "-c",
-            "ps -ef |grep -v -P \"\\sgrep\\s\" | grep " + config.getCassProcessName()
-        };
-        new Expectations(r) {
-            {
-                r.exec(cmd);
-                result = mockProcess;
-            }
-        };
-        instanceState.setShouldCassandraBeAlive(false);
-        instanceState.setCassandraProcessAlive(false);
-
-        monitor.execute();
-
-        Assert.assertTrue(!instanceState.shouldCassandraBeAlive());
-        Assert.assertTrue(instanceState.isCassandraProcessAlive());
-        new Verifications() {
-            {
-                cassProcess.start(anyBoolean);
-                times = 0;
-            }
-        };
-    }
-
-    @Test
-    public void testAutoRemediationRateLimit() throws Exception {
-        final InputStream mockOutput = new ByteArrayInputStream("".getBytes());
-        instanceState.setShouldCassandraBeAlive(true);
-        instanceState.markLastAttemptedStartTime();
-        new Expectations() {
-            {
-                // 6 calls to execute should = 12 calls to getInputStream();
-                mockProcess.getInputStream();
-                result = mockOutput;
-                times = 12;
-                cassProcess.start(true);
-                times = 2;
-            }
-        };
-        // Mock out the ps call
-        final Runtime r = Runtime.getRuntime();
-        String[] cmd = {
-            "/bin/sh",
-            "-c",
-            "ps -ef |grep -v -P \"\\sgrep\\s\" | grep " + config.getCassProcessName()
-        };
-        new Expectations(r) {
-            {
-                r.exec(cmd);
-                result = mockProcess;
-            }
-        };
-        // Sleep ahead to ensure we have permits in the rate limiter
-        monitor.execute();
-        Thread.sleep(1500);
-        monitor.execute();
-        monitor.execute();
-        Thread.sleep(1500);
-        monitor.execute();
-        monitor.execute();
-        monitor.execute();
-
-        new Verifications() {};
-    }
-}
diff --git a/priam/src/test/java/com/netflix/priam/tuner/dse/DseConfigStub.java b/priam/src/test/java/com/netflix/priam/tuner/dse/DseConfigStub.java
deleted file mode 100644
index ec008e2d2..000000000
--- a/priam/src/test/java/com/netflix/priam/tuner/dse/DseConfigStub.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2017 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.netflix.priam.tuner.dse;
-
-import com.netflix.priam.config.FakeConfiguration;
-import java.util.HashSet;
-import java.util.Set;
-
-public class DseConfigStub implements IDseConfiguration {
-    boolean auditLogEnabled;
-
-    public String getDseYamlLocation() {
-        return new FakeConfiguration().getCassHome() + "/resources/dse/conf/dse.yaml";
-    }
-
-    public String getDseDelegatingSnitch() {
-        return null;
-    }
-
-    public NodeType getNodeType() {
-        return null;
-    }
-
-    public boolean isAuditLogEnabled() {
-        return auditLogEnabled;
-    }
-
-    public void setAuditLogEnabled(boolean b) {
-        auditLogEnabled = b;
-    }
-
-    public String getAuditLogExemptKeyspaces() {
-        return "YourSwellKeyspace";
-    }
-
-    public Set<AuditLogCategory> getAuditLogCategories() {
-        return new HashSet<AuditLogCategory>() {
-            {
-                this.add(AuditLogCategory.ALL);
-            }
-        };
-    }
-}
diff --git a/priam/src/test/java/com/netflix/priam/tuner/dse/DseTunerTest.java b/priam/src/test/java/com/netflix/priam/tuner/dse/DseTunerTest.java
deleted file mode 100644
index b65f88ae5..000000000
--- a/priam/src/test/java/com/netflix/priam/tuner/dse/DseTunerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2017 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.netflix.priam.tuner.dse;
-
-import com.google.common.io.Files;
-import com.netflix.priam.config.FakeConfiguration;
-import com.netflix.priam.config.IConfiguration;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Properties;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DseTunerTest {
-    IConfiguration config;
-    DseConfigStub dseConfig;
-    DseTuner dseTunerYaml;
-    DseTuner dseTunerLog4j;
-    AuditLogTunerYaml auditLogTunerYaml;
-    AuditLogTunerLog4J auditLogTunerLog4j;
-    File targetFile;
-    File targetDseYamlFile;
-
-    @Before
-    public void setup() throws IOException {
-        config = new FakeConfiguration();
-        dseConfig = new DseConfigStub();
-        auditLogTunerYaml = new AuditLogTunerYaml(dseConfig);
-        auditLogTunerLog4j = new AuditLogTunerLog4J(config, dseConfig);
-
-        File targetDir = new File(config.getCassHome() + "/conf");
-        if (!targetDir.exists()) targetDir.mkdirs();
-
-        targetFile = new File(config.getCassHome() + AuditLogTunerLog4J.AUDIT_LOG_FILE);
-        Files.copy(new File("src/test/resources/" + AuditLogTunerLog4J.AUDIT_LOG_FILE), targetFile);
-    }
-
-    @Test
-    public void auditLogProperties_Enabled() throws IOException {
-        dseConfig.setAuditLogEnabled(true);
-        auditLogTunerLog4j.tuneAuditLog();
-
-        Properties p = new Properties();
-        p.load(new FileReader(targetFile));
-        Assert.assertTrue(p.containsKey(AuditLogTunerLog4J.PRIMARY_AUDIT_LOG_ENTRY));
-    }
-
-    @Test
-    public void auditLogProperties_Disabled() throws IOException {
-        dseConfig.setAuditLogEnabled(false);
-        auditLogTunerLog4j.tuneAuditLog();
-
-        Properties p = new Properties();
-        p.load(new FileReader(targetFile));
-        Assert.assertFalse(p.containsKey(AuditLogTunerLog4J.PRIMARY_AUDIT_LOG_ENTRY));
-    }
-
-    /**
-     * This is different because we test the disabled step using the already used enabled file (not
-     * a clean copy over of the original props file from the resources dir), and vice versa
-     *
-     * @throws IOException when file is not found or permissions.
-     */
-    @Test
-    public void auditLogProperties_ThereAndBackAgain() throws IOException {
-        auditLogProperties_Enabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Disabled();
-        auditLogProperties_Enabled();
-        auditLogProperties_Enabled();
-    }
-
-    @Test
-    public void auditLogYamlProperties_Enabled() throws IOException {
-        File targetDseDir = new File(config.getCassHome() + "/resources/dse/conf/");
-        if (!targetDseDir.exists()) {
-            targetDseDir.mkdirs();
-        }
-
-        int index = dseConfig.getDseYamlLocation().lastIndexOf('/') + 1;
-        targetDseYamlFile =
-                new File(targetDseDir + dseConfig.getDseYamlLocation().substring(index - 1));
-        Files.copy(
-                new File(
-                        "src/test/resources/conf/"
-                                + dseConfig.getDseYamlLocation().substring(index)),
-                targetDseYamlFile);
-
-        dseConfig.setAuditLogEnabled(true);
-        auditLogTunerYaml.tuneAuditLog();
-    }
-
-    @Test
-    public void auditLogYamlProperties_Disabled() throws IOException {
-        File targetDseDir = new File(config.getCassHome() + "/resources/dse/conf/");
-        if (!targetDseDir.exists()) {
-            targetDseDir.mkdirs();
-        }
-
-        int index = dseConfig.getDseYamlLocation().lastIndexOf('/') + 1;
-        targetDseYamlFile =
-                new File(targetDseDir + dseConfig.getDseYamlLocation().substring(index - 1));
-        Files.copy(
-                new File(
-                        "src/test/resources/conf/"
-                                + dseConfig.getDseYamlLocation().substring(index)),
-                targetDseYamlFile);
-
-        dseConfig.setAuditLogEnabled(false);
-        auditLogTunerYaml.tuneAuditLog();
-    }
-}