diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index f2eb30f2275208dad8e7fbbc9e27cff0b0b16b14..c1c6899c423619e38e9382d6cc6a3d23c9209024 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -1382,11 +1382,14 @@ void BeamServer::compute_weights(Timestamp weightTime)
 		blitz::Array<double, 2> rcuPosITRF = LBAfield ? itsAntennaPos->LBARCUPos() : itsAntennaPos->HBARCUPos();
 		LOG_DEBUG_STR("ITRFRCUPos = " << rcuPosITRF);
 
-		// Get geographical location of subarray in ITRF
+		// Get geographical location of subarray in ITRF and place it in an AMC Position class.
 		blitz::Array<double, 1> fieldCentreITRF = LBAfield ? itsAntennaPos->LBACentre() : itsAntennaPos->HBACentre();
 		Position	fieldPositionITRF(Coord3D(blitz2vector(fieldCentreITRF)), Position::ITRF);
 		LOG_DEBUG_STR("ITRF position antennaField: " << fieldPositionITRF);
 
+		// Lengths of the vector of the antennaPosition i.r.t. the fieldCentre,
+		blitz::Array<double,1>	rcuPosLengths = LBAfield ? itsAntennaPos->LBARCULengths() : itsAntennaPos->HBARCULengths();
+
 		// for all beams using this field
 		map<string, Beam*>::iterator	beamIter = itsBeamPool.begin();
 		map<string, Beam*>::iterator	end		 = itsBeamPool.end();
@@ -1427,13 +1430,11 @@ void BeamServer::compute_weights(Timestamp weightTime)
 				ResultData	result;
 				itsAMCclient.itrfToJ2000(result, request);
 				vector<double>	direction = result.direction[0].coord().get();
+
 				// Note AMCServer returns an unit vector.
-				double	originalLength = sqrt((rcuPosITRF(rcu,0)*rcuPosITRF(rcu,0)) +
-											  (rcuPosITRF(rcu,1)*rcuPosITRF(rcu,1)) +
-											  (rcuPosITRF(rcu,2)*rcuPosITRF(rcu,2)));
-				J2000SingleRCUPos(0) = direction[0] * originalLength;
-				J2000SingleRCUPos(1) = direction[1] * originalLength;
-				J2000SingleRCUPos(2) = direction[2] * originalLength;
+				J2000SingleRCUPos(0) = direction[0] * rcuPosLengths(rcu);
+				J2000SingleRCUPos(1) = direction[1] * rcuPosLengths(rcu);
+				J2000SingleRCUPos(2) = direction[2] * rcuPosLengths(rcu);
 				LOG_DEBUG_STR("J2000RCUPos[" << rcu << "]=[" << J2000SingleRCUPos(0) << ", " << 
 								J2000SingleRCUPos(1) << ", " << J2000SingleRCUPos(2) << "]");
 				// END OF NOTE.
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc b/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc
deleted file mode 100644
index 10f16a9abac31ae1f66f7b2bec4d6895f5f29241..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-//# Get revision info; generated by autoconf_share/makeversion
-
-//## pkg=ITRFBeamServer
-//## incpath=ITRFBeamServer
-//## incdir=src
-
-#include <ITRFBeamServer/Package__Version.h>
-#include <Common/Version.h>
-#include "FillPackage__VersionInc.h"
-
-namespace LOFAR {
-  Version ITRFBeamServerVersion::getInfo()
-  {
-    return Version ("ITRFBeamServer",
-		    getVersion(), getConfVersion(),
-		    getRevision(), getPackageRevision(),
-		    getNrChangedFiles(),
-		    getBuildTime(), getBuildUser(), getBuildMachine());
-  }
-
-  std::string ITRFBeamServerVersion::getVersion()
-    { return "Unknown"; }
-  std::string ITRFBeamServerVersion::getConfVersion()
-    { return "0.1"; }
-  std::string ITRFBeamServerVersion::getRevision()
-    { return "Unknown"; }
-  std::string ITRFBeamServerVersion::getPackageRevision()
-    { return "Unknown"; }
-  std::string ITRFBeamServerVersion::getNrChangedFiles()
-    { return "0"; }
-}
-
-//# fillversion.h is generated in build area by lofar_internal.m4
-//# It contains function fillInfo
-#include "FillPackage__VersionFunc.h"