diff --git a/Appl/CEP/CS1/CS1_IONProc/src/CS1_ION_main.cc b/Appl/CEP/CS1/CS1_IONProc/src/CS1_ION_main.cc
index 3befc78e002b9ca92cb20d78d10c8c79bd366fcd..059546a73be0625aa7e374122b0b77d1432c6368 100644
--- a/Appl/CEP/CS1/CS1_IONProc/src/CS1_ION_main.cc
+++ b/Appl/CEP/CS1/CS1_IONProc/src/CS1_ION_main.cc
@@ -86,7 +86,7 @@ void createClientTHs(unsigned nrClients)
     clientTHs[core] = new TH_ZoidServer(core);
 #elif 0
     clientTHs[core] = new TH_Null;
-#elif 0
+#elif 1
     clientTHs[core] = new TH_Socket(boost::lexical_cast<string>(5000 + core));
 
     while (!clientTHs[core]->init())
diff --git a/Appl/CEP/CS1/CS1_IONProc/src/Makefile.am b/Appl/CEP/CS1/CS1_IONProc/src/Makefile.am
index 236440bd99cf12ea4f59e167217b0572a80cb4b7..6fcd5422707e8dac3b37839644657836ed69ffbe 100644
--- a/Appl/CEP/CS1/CS1_IONProc/src/Makefile.am
+++ b/Appl/CEP/CS1/CS1_IONProc/src/Makefile.am
@@ -29,22 +29,22 @@ WH_ION_Gather.cc		\
 TH_ZoidServer.cc                \
 Package__Version.cc
 
-if HAVE_ZOID
-lib_LTLIBRARIES			= liblofar_impl.la
-bin_PROGRAMS			= versioncs1_ionproc
-
-install-exec-local:
-	ln -sf .libs/liblofar_impl.so.0.0.0 lofar_impl.so
-	cp lofar_impl.so /bgl/lofar-utils/zoid-test/lib
-
-uninstall-local:
-	rm lofar_impl.so
-else
+#if HAVE_ZOID
+#lib_LTLIBRARIES			= liblofar_impl.la
+#bin_PROGRAMS			= versioncs1_ionproc
+#
+#install-exec-local:
+#	ln -sf .libs/liblofar_impl.so.0.0.0 lofar_impl.so
+#	cp lofar_impl.so /bgl/lofar-utils/zoid-test/lib
+#
+#uninstall-local:
+#	rm lofar_impl.so
+#else
 IONProc_SOURCES			= $(liblofar_impl_la_SOURCES)
 IONProc_DEPENDENCIES		= $(LOFAR_DEPEND)
 
 bin_PROGRAMS			= versioncs1_ionproc IONProc
-endif
+#endif
 
 versioncs1_ionproc_SOURCES      = versioncs1_ionproc.cc Package__Version.cc 
 versioncs1_ionproc_DEPENDENCIES = $(LOFAR_DEPEND)