diff --git a/CEP/BB/BBSControl/include/BBSControl/Makefile.am b/CEP/BB/BBSControl/include/BBSControl/Makefile.am
index 674690a567893f13322c1664d4b8b6c452a30b5f..913176a34302f1c8f6fe03d9e6af441f02b681c1 100644
--- a/CEP/BB/BBSControl/include/BBSControl/Makefile.am
+++ b/CEP/BB/BBSControl/include/BBSControl/Makefile.am
@@ -27,7 +27,6 @@ pkginclude_HEADERS = \
 	IterationResult.h \
 	KernelProcessControl.h \
 	NextChunkCommand.h \
-	Property.h \
 	SolverProcessControl.h
 
 noinst_HEADERS = \
diff --git a/CEP/BB/BBSControl/src/CommandQueue.cc b/CEP/BB/BBSControl/src/CommandQueue.cc
index 9f770331b536103c0a72861149805de0012ff678..13ab7f9fb8282595de1a2cb337245979d6b89df3 100644
--- a/CEP/BB/BBSControl/src/CommandQueue.cc
+++ b/CEP/BB/BBSControl/src/CommandQueue.cc
@@ -27,13 +27,11 @@
 #include <BBSControl/CommandQueue.h>
 #include <BBSControl/CommandQueueTransactors.h>
 #include <BBSControl/QueryBuilder/AddCommand.h>
-#include <BBSControl/QueryBuilder/GetNextCommand.h>
 #include <BBSControl/BBSSingleStep.h>
 #include <BBSControl/BBSSolveStep.h>
 #include <BBSControl/BBSStrategy.h>
 #include <BBSControl/BBSStructs.h>
 #include <BBSControl/Exceptions.h>
-#include <BBSControl/CommandInserter.h>
 #include <APS/ParameterSet.h>
 #include <APS/Exceptions.h>
 #include <Common/StreamUtil.h>
diff --git a/CEP/BB/BBSControl/test/Makefile.am b/CEP/BB/BBSControl/test/Makefile.am
index 39b90791999e5796206217794566c83639395bb4..7e325df5781efc090c3f34074a9b7d902ca6fee3 100644
--- a/CEP/BB/BBSControl/test/Makefile.am
+++ b/CEP/BB/BBSControl/test/Makefile.am
@@ -1,8 +1,6 @@
-check_PROGRAMS			= tpqxx \
-				  tpqutil \
+check_PROGRAMS			= tpqutil \
 				  tBBSStrategy \
-				  tCommandQueue \
-				  tQuery
+				  tCommandQueue
 
 check_SCRIPTS			= tpqutil.sh \
 				  tBBSStrategy.sh \
@@ -14,10 +12,6 @@ CHECKTOOLPROGS			= tpqutil \
 				  tCommandQueue
 #ENDCHECKTOOLPROGS
 
-tpqxx_SOURCES			= tpqxx.cc
-tpqxx_LDADD			= ../src/libbbscontrol.la
-tpqxx_DEPENDENCIES		= ../src/libbbscontrol.la $(LOFAR_DEPEND)
-
 tpqutil_SOURCES			= tpqutil.cc
 tpqutil_LDADD			= ../src/libbbscontrol.la
 tpqutil_DEPENDENCIES		= ../src/libbbscontrol.la $(LOFAR_DEPEND)
@@ -31,10 +25,6 @@ tCommandQueue_SOURCES		= tCommandQueue.cc
 tCommandQueue_LDADD		= ../src/libbbscontrol.la
 tCommandQueue_DEPENDENCIES	= ../src/libbbscontrol.la $(LOFAR_DEPEND)
 
-tQuery_SOURCES			= tQuery.cc
-tQuery_LDADD			= ../src/libbbscontrol.la
-tQuery_DEPENDENCIES		= ../src/libbbscontrol.la $(LOFAR_DEPEND)
-
 TESTS				= $(check_SCRIPTS)
 
 EXTRA_DIST			= $(check_SCRIPTS) \