diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 6d24b1a6fa..1f691b0edb 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -1097,7 +1097,7 @@ public:
 					// Add non-test processes (ie. datahall is not be set for test processes)
 					if (processInfo->startingClass != ProcessClass::TesterClass) {
 						// Add machine processes to dead group if dead or specified kill machine
-						if (processInfo->failed || machineRec.second.dead || (machineRec.second.zoneId == zoneId))
+						if (processInfo->failed || (machineRec.second.zoneId == zoneId))
 							processesDead.push_back(processInfo);
 						else
 							processesLeft.push_back(processInfo);
@@ -1112,7 +1112,6 @@ public:
 			}
 			else if ((kt == KillInstantly) || (kt == InjectFaults)) {
 				TraceEvent("DeadMachine", zoneId).detailext("ZoneId", zoneId).detail("KillType", kt).detail("ProcessesLeft", processesLeft.size()).detail("ProcessesDead", processesDead.size()).detail("TotalZones", machines.size()).detail("processesPerMachine", processesPerMachine).detail("tLogPolicy", tLogPolicy->info()).detail("storagePolicy", storagePolicy->info());
-				machines[zoneId].dead = true;
 			}
 			else {
 				TraceEvent("ClearMachine", zoneId).detailext("ZoneId", zoneId).detail("KillType", kt).detail("ProcessesLeft", processesLeft.size()).detail("ProcessesDead", processesDead.size()).detail("TotalZones", machines.size()).detail("processesPerMachine", processesPerMachine).detail("tLogPolicy", tLogPolicy->info()).detail("storagePolicy", storagePolicy->info());
@@ -1173,7 +1172,7 @@ public:
 					// Add non-test processes (ie. datahall is not be set for test processes)
 					if (processInfo->startingClass != ProcessClass::TesterClass) {
 						// Add processes from dead machines and datacenter machines to dead group
-						if (processInfo->failed || machineRec.second.dead || (datacenterZones.find(machineRec.second.zoneId) != datacenterZones.end()))
+						if (processInfo->failed || (datacenterZones.find(machineRec.second.zoneId) != datacenterZones.end()))
 							processesDead.push_back(processInfo);
 						else
 							processesLeft.push_back(processInfo);
@@ -1245,7 +1244,6 @@ public:
 		for( auto process : machine.processes ) {
 			ASSERT( process->failed );
 		}
-		machine.dead = true;
 		if( machine.machineProcess ) {
 			 killProcess_internal( machine.machineProcess, KillInstantly );
 		}
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index f963014c19..e91de1de40 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -93,9 +93,8 @@ public:
 		std::map<std::string, Future<Reference<IAsyncFile>>> openFiles;
 		std::set<std::string> closingFiles;
 		Optional<Standalone<StringRef>>	zoneId;
-		bool dead;
 
-		MachineInfo() : machineProcess(0), dead(false) {}
+		MachineInfo() : machineProcess(0) {}
 	};
 
 	template <class Func>
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index 46ab5549a7..0b740dea3f 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -182,7 +182,6 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 
 		// The actor final boolean argument is a hack to prevent the second part of this function from happening
 		// Fix Me
-		NOT_IN_CLEAN;
 		if (exitAfterInclude) return Void();
 
 		std::vector<NetworkAddress> coordinators = wait( getCoordinators(cx) );