diff --git a/slsDetectorServers/matterhonServer/CMakeLists.txt b/slsDetectorServers/matterhonServer/CMakeLists.txt
index 078a034d3..280ab64bc 100644
--- a/slsDetectorServers/matterhonServer/CMakeLists.txt
+++ b/slsDetectorServers/matterhonServer/CMakeLists.txt
@@ -4,7 +4,7 @@
 add_executable(matterhornDetectorServer_virtual
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornApp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VirtualMatterhornServer.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/src/StopServer.cpp
+    #${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/CommandLineOptions.cpp
 )
 
diff --git a/slsDetectorServers/matterhonServer/src/MatterhornApp.cpp b/slsDetectorServers/matterhonServer/src/MatterhornApp.cpp
index 9debc24b5..4ec30921b 100644
--- a/slsDetectorServers/matterhonServer/src/MatterhornApp.cpp
+++ b/slsDetectorServers/matterhonServer/src/MatterhornApp.cpp
@@ -1,5 +1,4 @@
 #include "CommandLineOptions.h"
-#include "StopServer.h"
 #include "VirtualMatterhornServer.h"
 #include "sls/logger.h"
 #include "sls/sls_detector_exceptions.h"
diff --git a/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp b/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp
index 4ced25a56..522d5b486 100644
--- a/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp
+++ b/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp
@@ -3,7 +3,7 @@
 namespace sls {
 
 MatterhornServer::MatterhornServer(uint16_t port)
-    : BaseMatterhornServer(port) {
+    : BaseMatterhornServer<MatterhornServer>(port) {
 
     // TODO: when do i set the udp mac and ip ?
 
@@ -21,9 +21,4 @@ ReturnCode MatterhornServer::initial_checks(ServerInterface &socket) {
     return static_cast<ReturnCode>(socket.sendResult(initial_checks_passed));
 }
 
-ReturnCode MatterhornServer::get_update_mode(ServerInterface &socket) {
-    return static_cast<ReturnCode>(
-        socket.sendResult(static_cast<int>(updateMode)));
-}
-
 } // namespace sls
\ No newline at end of file
diff --git a/slsDetectorServers/matterhonServer/src/StopServer.cpp b/slsDetectorServers/matterhonServer/src/StopServer.cpp
deleted file mode 100644
index 82e7c5ec6..000000000
--- a/slsDetectorServers/matterhonServer/src/StopServer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#include "StopServer.h"
-#include "sls/network_utils.h"
-#include "sls/sls_detector_defs.h"
-
-namespace sls {
-StopServer::StopServer(uint16_t port) : MatterhornServer(port) {
-
-    /*
-    // open shared memory segment of control server map to virtual memory space
-    if (sharedMemory_open(port - 1) == slsDetectorDefs::FAIL) {
-        throw sls::RuntimeError("Failed to open shared memory");
-    }
-    */
-}
-
-} // namespace sls