diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc
index f292b81d8..56443db3a 100644
--- a/src/xenia/gpu/graphics_system.cc
+++ b/src/xenia/gpu/graphics_system.cc
@@ -138,12 +138,7 @@ X_STATUS GraphicsSystem::Setup(cpu::Processor* processor,
 void GraphicsSystem::Shutdown() {
   if (command_processor_) {
     EndTracing();
-  }
-
-  if (command_processor_) {
     command_processor_->Shutdown();
-    // TODO(benvanik): remove mapped range.
-    command_processor_.reset();
   }
 
   if (vsync_worker_thread_) {