diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp
index 51a5e86288..8ccb4491ee 100644
--- a/src/servers/registrar/ShutdownProcess.cpp
+++ b/src/servers/registrar/ShutdownProcess.cpp
@@ -1007,11 +1007,7 @@ ShutdownProcess::_AddShutdownWindowApps(AppInfoList& infos)
 		}
 
 		// get the application icons
-#ifdef __HAIKU__
 		color_space format = B_RGBA32;
-#else
-		color_space format = B_CMAP8;
-#endif
 
 		// mini icon
 		BBitmap* miniIcon = new(nothrow) BBitmap(BRect(0, 0, 15, 15), format);
@@ -1380,13 +1376,10 @@ ShutdownProcess::_WorkerDoShutdown()
 
 	// either there's no GUI or reboot failed: we enter the kernel debugger
 	// instead
-#ifdef __HAIKU__
-// TODO: Introduce the syscall.
-//	while (true) {
-//		_kern_kernel_debugger("The system is shut down. It's now safe to turn "
-//			"off the computer.");
-//	}
-#endif
+	while (true) {
+		_kern_kernel_debugger("The system is shut down. It's now safe to turn "
+			"off the computer.");
+	}
 }
 
 
@@ -1680,13 +1673,8 @@ ShutdownProcess::_QuitNonApps()
 		if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) {
 			PRINT("  sending team %" B_PRId32 " TERM signal\n", teamInfo.team);
 
-			#ifdef __HAIKU__
-				// Note: team ID == team main thread ID under Haiku
-				send_signal(teamInfo.team, SIGTERM);
-			#else
-				// We don't want to do this when testing under R5, since it
-				// would kill all teams besides our app server and registrar.
-			#endif
+			// Note: team ID == team main thread ID under Haiku
+			send_signal(teamInfo.team, SIGTERM);
 		}
 	}
 
@@ -1701,12 +1689,7 @@ ShutdownProcess::_QuitNonApps()
 		if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) {
 			PRINT("  killing team %" B_PRId32 "\n", teamInfo.team);
 
-			#ifdef __HAIKU__
-				kill_team(teamInfo.team);
-			#else
-				// We don't want to do this when testing under R5, since it
-				// would kill all teams besides our app server and registrar.
-			#endif
+			kill_team(teamInfo.team);
 		}
 	}