diff --git a/SAS/XML_generator/src/xmlgen.py b/SAS/XML_generator/src/xmlgen.py
index f19b2a16435ffebeb350994df635a1abc85892ee..c69821055963ae3a1f0680c1d989d771401418d4 100755
--- a/SAS/XML_generator/src/xmlgen.py
+++ b/SAS/XML_generator/src/xmlgen.py
@@ -275,17 +275,6 @@ def hasCoherentTab(TAB):
 def processingCluster(cluster, number_of_tasks):
   if not number_of_tasks:
       number_of_tasks = 24
-  CEP2 = r"""  <processingCluster>
-                    <name>CEP2</name>
-                    <partition>cpu</partition>
-                    <numberOfTasks>%i</numberOfTasks>
-                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
-                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
-                    <maxDurationPerTask>PT600S</maxDurationPerTask>
-                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
-                    <runSimultaneous>true</runSimultaneous>
-                  </processingCluster>"""
-
   CEP4 = r"""  <processingCluster>
                     <name>CEP4</name>
                     <partition>cpu</partition>
@@ -297,26 +286,22 @@ def processingCluster(cluster, number_of_tasks):
                     <runSimultaneous>true</runSimultaneous>
                   </processingCluster>"""
 
-  if cluster == "CEP4":
+  if cluster in ["", "CEP4"]:
     result = CEP4 % (number_of_tasks,)
   else:
-    result = r"" #CEP2 % (number_of_tasks,)
+    raise GenException("Unknown cluster specified: %s" % cluster)
   return result
 
 def dataProductCluster(cluster):
-  CEP2 = r"""  <storageCluster>
-                      <name>CEP2</name>
-                      <partition>/data</partition>
-                    </storageCluster>"""
   CEP4 = r"""<storageCluster>
                       <name>CEP4</name>
                       <partition>/data/projects/</partition>
                     </storageCluster>"""
 
-  if cluster == "CEP4":
+  if cluster in ["", "CEP4"]:
     result = CEP4
   else:
-    result = r"" #CEP2
+    raise GenException("Unknown cluster specified: %s" % cluster)
   return result
 
 def writeXMLObs(ofile, name, descr, topo, predecessor_topo, attrname, projname, TBBpiggyBack, aartfaacPiggyBack, cordata, cohdata, incohdata, antenna, clock, instrfilt, interval, channels,
@@ -2248,7 +2233,7 @@ def writeBlock(ofile, settings, projectName, blockNr, status, nr_nodes):
   "tbbPiggybackAllowed":True,
   "aartfaacPiggybackAllowed":True,
   "imagingBBS": '',
-  "cluster":'CEP2'}
+  "cluster":'CEP4'}
   defaults.update(settings) #FIXME somewhat dirty hack, to be solved better later.
   settings = defaults
   if 'nr_nodes' in settings:  # We can set a (different) number per BLOCK