diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc b/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
index 5a21be64f27f1430c34d72d7ec124fcce34b6967..04cfe4b265ed88f372cf267926d9effc05b56f14 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
+++ b/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
@@ -27,7 +27,6 @@
#include <Stream/FileStream.h>
#include <Stream/NullStream.h>
#include <Stream/SocketStream.h>
-#include <CS1_BGLProc/TH_ZoidClient.h>
#include <CS1_BGLProc/LocationInfo.h>
#include <CS1_BGLProc/BGL_Processing.h>
#include <CS1_BGLProc/Package__Version.h>
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/CorrelatedData.h b/Appl/CEP/CS1/CS1_BGLProc/src/CorrelatedData.h
index 7aeada0b09c85a040a931de93c8f4ea4f3c2239e..f86004ece15f67352f86db7a2daa8f0a6fac2bb0 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/src/CorrelatedData.h
+++ b/Appl/CEP/CS1/CS1_BGLProc/src/CorrelatedData.h
@@ -6,8 +6,6 @@
#include <CS1_Interface/Allocator.h>
#include <Stream/Stream.h>
-#include <TH_ZoidClient.h>
-
#include <boost/multi_array.hpp>
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/InputData.h b/Appl/CEP/CS1/CS1_BGLProc/src/InputData.h
index d85eec5ab0ce59f02d08a3b6c6d1bfcfea180325..fcff4a631a066f4bb6e16def421e8f60257dae22 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/src/InputData.h
+++ b/Appl/CEP/CS1/CS1_BGLProc/src/InputData.h
@@ -9,7 +9,6 @@
#include <Stream/Stream.h>
#include <CS1_Interface/Allocator.h>
-#include <TH_ZoidClient.h>
#include <boost/multi_array.hpp>
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.cc b/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.cc
deleted file mode 100644
index b5ed9415a17fe0aa49b76941cd00601133018d91..0000000000000000000000000000000000000000
--- a/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-//# TH_FCNP.cc: Fast Collective Network Protocol
-//#
-//# Copyright (C) 2008
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# $Id$
-
-//# Always #include <lofar_config.h> first!
-#include <lofar_config.h>
-
-#if defined HAVE_FCNP && defined HAVE_BGP
-
-#include <Common/Timer.h>
-#include <Transport/DataHolder.h>
-#include <TH_FCNP_Client.h>
-
-#include <fcnp_cn.h>
-
-#include <algorithm>
-
-
-namespace LOFAR {
-namespace CS1 {
-
-
-TH_FCNP_Client::~TH_FCNP_Client()
-{
-}
-
-
-bool TH_FCNP_Client::init()
-{
- return true;
-}
-
-
-bool TH_FCNP_Client::sendBlocking(void *buf, int size, int unaligned, DataHolder *)
-{
- //std::clog << std::dec << "TH_FCNP_Client::sendBlocking(" << buf << ", " << size << ", ...)" << std::endl;
-
- if (unaligned) {
- size_t alignedSize = (size + 15) & ~ (size_t) 15;
- char tmp[alignedSize] __attribute__ ((aligned(16)));
-
- memcpy(tmp, buf, size);
- FCNP_CN::CNtoION_ZeroCopy(tmp, alignedSize);
- } else {
- FCNP_CN::CNtoION_ZeroCopy(const_cast<const void *>(buf), size);
- }
-
- return true;
-}
-
-
-bool TH_FCNP_Client::recvBlocking(void *buf, int size, int unaligned, int, DataHolder *)
-{
- //std::clog << std::dec << "TH_FCNP_Client::recvBlocking(" << buf << ", " << size << ", ...)" << std::endl;
-
- if (unaligned) {
- size_t alignedSize = (size + 15) & ~ (size_t) 15;
- char tmp[alignedSize] __attribute__ ((aligned(16)));
-
- FCNP_CN::IONtoCN_ZeroCopy(tmp, alignedSize);
- memcpy(buf, tmp, size);
- } else {
- FCNP_CN::IONtoCN_ZeroCopy(buf, size);
- }
-
- return true;
-}
-
-
-// functions below are not supported
-
-int32 TH_FCNP_Client::recvNonBlocking(void *, int32, int, int32, DataHolder *)
-{
- return false;
-}
-
-
-void TH_FCNP_Client::waitForReceived(void *, int, int)
-{
-}
-
-
-bool TH_FCNP_Client::sendNonBlocking(void *, int, int, DataHolder *)
-{
- return false;
-}
-
-
-void TH_FCNP_Client::waitForSent(void *, int, int)
-{
-}
-
-
-string TH_FCNP_Client::getType() const
-{
- return "TH_FCNP_Client";
-}
-
-
-bool TH_FCNP_Client::isClonable() const
-{
- return true;
-}
-
-
-TransportHolder *TH_FCNP_Client::clone() const
-{
- return new TH_FCNP_Client;
-}
-
-
-void TH_FCNP_Client::reset()
-{
-}
-
-} // namespace CS1
-} // namespace LOFAR
-
-#endif
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.h b/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.h
deleted file mode 100644
index 67e524dda8f1c3c0343d2861fbabd4cc0738f466..0000000000000000000000000000000000000000
--- a/Appl/CEP/CS1/CS1_BGLProc/src/TH_FCNP_Client.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//# TH_FCNP_Client.h: TransportHolder that implements FCNP protocol
-//#
-//# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# $Id$
-
-#ifndef LOFAR_TRANSPORTTH_FCNP_CLIENT_H
-#define LOFAR_TRANSPORTTH_FCNP_CLIENT_H
-
-#if defined HAVE_FCNP && defined HAVE_BGP
-
-// \file
-// TransportHolder that does nothing
-
-//# Never #include <config.h> or #include <lofar_config.h> in a header file!
-
-//# Includes
-#include <Transport/TransportHolder.h>
-
-namespace LOFAR {
-namespace CS1 {
-
-class TH_FCNP_Client : public TransportHolder
-{
- public:
- TH_FCNP_Client() {}
- virtual ~TH_FCNP_Client();
-
-
- virtual bool init();
-
- virtual bool recvBlocking(void *ptr, int size, int unaligned, int, DataHolder *);
- virtual bool sendBlocking(void *ptr, int size, int unaligned, DataHolder *);
-
- static void sendCompleted(void *ptr, void *arg);
-
- // functions below are not supported
- virtual int32 recvNonBlocking(void *, int32, int, int32, DataHolder *);
- virtual void waitForReceived(void *, int, int);
- virtual bool sendNonBlocking (void *, int, int, DataHolder *);
- virtual void waitForSent(void *, int, int);
- virtual string getType() const;
- virtual bool isClonable() const;
- virtual TransportHolder* clone() const;
- virtual void reset();
-
- // Copying is not allowed
- TH_FCNP_Client(const TH_FCNP_Client& that);
- TH_FCNP_Client& operator=(const TH_FCNP_Client& that);
-};
-
-} // namespace CS1
-} // namespace LOFAR
-
-#endif
-#endif
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.cc b/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.cc
deleted file mode 100644
index 14946c19654f78293312ae069752f1698d5992a0..0000000000000000000000000000000000000000
--- a/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-//# TH_ZoidClient.cc: In-memory transport mechanism
-//#
-//# Copyright (C) 2000, 2001
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# $Id$
-
-//# Always #include <lofar_config.h> first!
-#include <lofar_config.h>
-
-#if defined HAVE_ZOID && defined HAVE_BGL
-
-#include <Transport/DataHolder.h>
-#include <CS1_BGLProc/TH_ZoidClient.h>
-
-extern "C" {
-#include <lofar.h>
-}
-
-namespace LOFAR {
-namespace CS1 {
-
-#if 0
-static unsigned checksum(const void *buf, size_t size)
-{
- unsigned sum = 0;
-
- for (int i = 0; i < (int) (size / sizeof(unsigned)); i ++)
- sum ^= ((unsigned *) buf)[i];
-
- return sum;
-}
-#endif
-
-bool TH_ZoidClient::recvBlocking(void *buf, int nbytes, int onecopy, int, DataHolder *)
-{
- //std::clog << "TH_ZoidClient::recvBlocking(" << buf << ", " << nbytes << "...)" << std::endl;
-
- static size_t maxBytes = ~ (size_t) 0;
-
- for (size_t bytesRead = 0; bytesRead < (size_t) nbytes;) {
- size_t count = std::min(nbytes - bytesRead, maxBytes);
- (onecopy ? lofar_ion_to_cn_onecopy : lofar_ion_to_cn_zerocopy)(static_cast<char *>(buf) + bytesRead, &count);
-
- switch (__zoid_error()) {
- case 0 : bytesRead += count;
- break;
-
- case E2BIG : maxBytes = nbytes - __zoid_excessive_size();
- break;
-
- default : return false;
- }
- }
-
- return true;
-}
-
-
-bool TH_ZoidClient::sendBlocking(void *buf, int nbytes, int onecopy, DataHolder *)
-{
- //std::clog << "TH_ZoidClient::sendBlocking(" << buf << ", " << nbytes << "...)" << std::endl;
-
- static size_t maxBytes = ~ (size_t) 0;
-
- for (size_t bytesWritten = 0; bytesWritten < (size_t) nbytes;) {
- size_t count = std::min(nbytes - bytesWritten, maxBytes);
-
- count = (onecopy ? lofar_cn_to_ion_onecopy : lofar_cn_to_ion_zerocopy)(static_cast<char *>(buf) + bytesWritten, count);
-
- switch (__zoid_error()) {
- case 0 : bytesWritten += count;
- break;
-
- case E2BIG : maxBytes = nbytes - __zoid_excessive_size();
- break;
-
- default : return false;
- }
- }
-
- return true;
-}
-
-} // namespace CS1
-} // namespace LOFAR
-
-#endif
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.h b/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.h
deleted file mode 100644
index 7e1796af55c94d932f037c08f728e97acce91885..0000000000000000000000000000000000000000
--- a/Appl/CEP/CS1/CS1_BGLProc/src/TH_ZoidClient.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//# TH_ZoidClient.h: TransportHolder that does nothing
-//#
-//# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# $Id$
-
-#ifndef LOFAR_TRANSPORTTH_ZOID_CLIENT_H
-#define LOFAR_TRANSPORTTH_ZOID_CLIENT_H
-
-#if defined HAVE_BGL
-
-// \file
-// TransportHolder that does nothing
-
-//# Never #include <config.h> or #include <lofar_config.h> in a header file!
-
-//# Includes
-#include <Transport/TransportHolder.h>
-
-namespace LOFAR {
-namespace CS1 {
-
-class TH_ZoidClient : public TransportHolder
-{
- public:
- TH_ZoidClient(){};
- virtual ~TH_ZoidClient(){};
-
- virtual bool init() {return true;};
-
- // if doCopy == 0, Zoid's zero-copy protocol is used; memory must be
- // obtained through __zoid_alloc and must be a multiple of 32
- virtual bool recvBlocking(void *ptr, int size, int doCopy, int, DataHolder*);
- virtual bool sendBlocking(void *ptr, int size, int doCopy, DataHolder*);
-
- virtual int32 recvNonBlocking (void*, int32, int, int32, DataHolder*)
- { return true; }
-
- virtual void waitForReceived(void*, int, int)
- {}
-
- virtual bool sendNonBlocking (void*, int, int, DataHolder*)
- { return true; }
-
- virtual void waitForSent(void*, int, int)
- {}
-
- virtual string getType() const
- { return "TH_ZoidClient"; }
-
- virtual bool isClonable() const
- { return true; }
-
- virtual TransportHolder* clone() const
- { return new TH_ZoidClient(); }
-
- virtual void reset()
- {}
-
- private:
- // Copying is not allowed
- TH_ZoidClient(const TH_ZoidClient& that);
- TH_ZoidClient& operator=(const TH_ZoidClient& that);
- };
-} // namespace CS1
-} // namespace LOFAR
-
-#endif
-#endif