diff --git a/CEP/CPA/PSS3/CAL/configure.in b/CEP/CPA/PSS3/CAL/configure.in
deleted file mode 100644
index d9a46bbf5c9984dcb2194053955a6bc90728f6ed..0000000000000000000000000000000000000000
--- a/CEP/CPA/PSS3/CAL/configure.in
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/MeqCalibraterImpl.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CAL, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-
-lofar_GENERAL
-
-dnl lofar_CORBA
-dnl lofar_MATLAB
-
-lofar_AIPSPP(1)
-lofar_MPI(0)
-
-
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(CEP/CPA/PSS3/MNS,MNS,,1,MNS/ParmTable.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/CPA/PSS3/MNS/configure.in b/CEP/CPA/PSS3/MNS/configure.in
deleted file mode 100644
index 4fe37247b4ca6864287e6b12b919e9094d46fcc9..0000000000000000000000000000000000000000
--- a/CEP/CPA/PSS3/MNS/configure.in
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/MeqExpr.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MNS, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_CORBA
-dnl lofar_MATLAB
-lofar_AIPSPP(1,"-lmeasures -ltables -lscimath -lscimath_f -lcasa")
-lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-test/Makefile 
-Makefile
-)
diff --git a/CEP/CPA/PSS3/lofarconf.in b/CEP/CPA/PSS3/lofarconf.in
deleted file mode 100644
index 704b046095bbf0c32217697e60139627c519be56..0000000000000000000000000000000000000000
--- a/CEP/CPA/PSS3/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-MNS
-CAL
diff --git a/CEP/CPA/lofarconf.in b/CEP/CPA/lofarconf.in
index 8ff1aca8cd94f058908d239e9ed2b57556d9c4b7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/CEP/CPA/lofarconf.in
+++ b/CEP/CPA/lofarconf.in
@@ -1 +0,0 @@
-PSS3