diff --git a/slsDetectorServers/CMakeLists.txt b/slsDetectorServers/CMakeLists.txt
index a495e3cf4..7a05de417 100644
--- a/slsDetectorServers/CMakeLists.txt
+++ b/slsDetectorServers/CMakeLists.txt
@@ -1,2 +1,5 @@
+add_subdirectory(ctbDetectorServer)
 add_subdirectory(eigerDetectorServer)
+add_subdirectory(gotthardDetectorServer)
 add_subdirectory(jungfrauDetectorServer)
+#add_subdirectory(moenchDetectorServer)
\ No newline at end of file
diff --git a/slsDetectorServers/ctbDetectorServer/Makefile.virtual b/slsDetectorServers/ctbDetectorServer/Makefile.virtual
deleted file mode 100755
index cfaacf70e..000000000
--- a/slsDetectorServers/ctbDetectorServer/Makefile.virtual
+++ /dev/null
@@ -1,27 +0,0 @@
-CC    		= gcc
-CFLAGS		+=  -Wall -DCHIPTESTBOARDD -DVIRTUAL -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
-LDLIBS		+= 	-lm  -lstdc++  -pthread
-
-PROGS		= 	ctbDetectorServer_virtual 
-DESTDIR		?= 	bin
-INSTMODE	= 	0777
-
-SRC_CLNT	=	communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS 		= 	$(SRC_CLNT:.c=.o) 
- 
-all: clean versioning $(PROGS)
-
-boot: $(OBJS) 
-
-versioning: 
-	@echo `tput setaf 6;	./updateGitVersion.sh; tput sgr0;`
-	
-$(PROGS): $(OBJS)
-#	echo $(OBJS) 
-	mkdir -p $(DESTDIR) 
-	$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) 
-	mv $(PROGS) $(DESTDIR)
-
-clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o
-	
diff --git a/slsDetectorServers/gotthardDetectorServer/Makefile.virtual b/slsDetectorServers/gotthardDetectorServer/Makefile.virtual
deleted file mode 100755
index 65174a82f..000000000
--- a/slsDetectorServers/gotthardDetectorServer/Makefile.virtual
+++ /dev/null
@@ -1,27 +0,0 @@
-CC          =   gcc
-CFLAGS      +=  -Wall -DGOTTHARDD -DVIRTUAL -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
-LDLIBS      +=  -lm  -lstdc++  -pthread
-
-PROGS       =   gotthardDetectorServer_virtual 
-DESTDIR     ?=  bin
-INSTMODE    =   0777
-
-SRC_CLNT    =   communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS        =   $(SRC_CLNT:.c=.o) 
- 
-all: clean versioning $(PROGS)
-
-boot: $(OBJS) 
-
-versioning: 
-    @echo `tput setaf 6;    ./updateGitVersion.sh; tput sgr0;`
-    
-$(PROGS): $(OBJS)
-#   echo $(OBJS) 
-    mkdir -p $(DESTDIR) 
-    $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) 
-    mv $(PROGS) $(DESTDIR)
-
-clean:
-    rm -rf $(DESTDIR)/$(PROGS)  *.o
-   
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
index 9c2bbebb7..d00b0d3e0 100755
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
@@ -3,11 +3,10 @@
 #include "clogger.h"
 #include "RegisterDefs.h"
 
-#ifndef VIRTUAL
 #include "AD9257.h"		// commonServerFunctions.h, blackfin.h, ansi.h
 #include "AD9252.h"     // old board compatibility
 #include "LTC2620.h"    // dacs
-#else
+#ifdef VIRTUAL
 #include "blackfin.h"
 #include <pthread.h>
 #include <time.h>
diff --git a/slsDetectorServers/moenchDetectorServer/Makefile.virtual b/slsDetectorServers/moenchDetectorServer/Makefile.virtual
deleted file mode 100755
index f502da862..000000000
--- a/slsDetectorServers/moenchDetectorServer/Makefile.virtual
+++ /dev/null
@@ -1,27 +0,0 @@
-CC    		= gcc
-CFLAGS		+=  -Wall -DMOENCHD -DVIRTUAL -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
-LDLIBS		+= 	-lm  -lstdc++  -pthread
-
-PROGS		= 	moenchDetectorServer_virtual 
-DESTDIR		?= 	bin
-INSTMODE	= 	0777
-
-SRC_CLNT	=	communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS 		= 	$(SRC_CLNT:.c=.o) 
- 
-all: clean versioning $(PROGS)
-
-boot: $(OBJS) 
-
-versioning: 
-	@echo `tput setaf 6;	./updateGitVersion.sh; tput sgr0;`
-	
-$(PROGS): $(OBJS)
-#	echo $(OBJS) 
-	mkdir -p $(DESTDIR) 
-	$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) 
-	mv $(PROGS) $(DESTDIR)
-
-clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o
-