diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
index bed06937ac70fdf526d51bf84f326da05947231d..9edd076d045650f6098e7d0b81df3700de9cb5c6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
@@ -110,8 +110,16 @@ def jetRecoSequence( dummyFlags, dataSource, RoIs = 'FSJETRoI', **jetRecoDict):
 
         # Start by adding the topocluster reco sequence
         # This makes EM clusters!
-        from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
-        (topoClusterSequence, clustersKey) = RecoFragmentsPool.retrieve(HLTFSTopoRecoSequence,RoIs)
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
+                caloClusterRecoSequence, LCCaloClusterRecoSequence)
+        if jetRecoDict["calib"] == "em":
+            topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
+                    caloClusterRecoSequence, flags=None, RoIs=RoIs)
+        elif jetRecoDict["calib"] == "lcw":
+            topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
+                    LCCaloClusterRecoSequence, flags=None, RoIs=RoIs)
+        else:
+            raise ValueError("Invalid value for calib: '{}'".format(jetRecoDict["calib"]))
         recoSeq += topoClusterSequence
 
         # Set up tracking sequence -- may need to reorganise or relocate
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index 8b4318d8a45d55ebd10ef76b653a60188786ea45..e5653ddbab2bfd56b39501fd1e1f99b54d67bbc0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -36,9 +36,10 @@ class CellConfig(AlgConfig):
     
     def __init__(self, **recoDict):
         super(CellConfig, self).__init__(**recoDict)
-        from TrigT2CaloCommon.CaloDef import HLTFSCellMakerRecoSequence
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import cellRecoSequence
         from TrigEFMissingET.TrigEFMissingETConf import HLT__MET__CellFex
-        (cellMakerSeq, cellName) = HLTFSCellMakerRecoSequence()
+        cellMakerSeq, cellName = RecoFragmentsPool.retrieve(
+                cellRecoSequence, flags=None, RoIs=self.inputMaker.RoIs)
 
         self.inputs = [cellMakerSeq]
         self.fexAlg = self._make_fex_alg(
@@ -50,14 +51,18 @@ class TCConfig(AlgConfig):
     def algType(cls):
         return "tc"
 
-    def __init__(self, **recoDict):
-        super(TCConfig, self).__init__(**recoDict)
-        from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
+    def __init__(self, calib, **recoDict):
+        super(TCConfig, self).__init__(calib=calib, **recoDict)
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
+                caloClusterRecoSequence, LCCaloClusterRecoSequence)
         from TrigEFMissingET.TrigEFMissingETConf import HLT__MET__TCFex
-        # TODO - cluster calibration
         RoIs = self.inputMaker.RoIs
-        tcSeq, clusterName = RecoFragmentsPool.retrieve(
-                HLTFSTopoRecoSequence, RoIs)
+        if calib == "em": 
+            tcSeq, clusterName = RecoFragmentsPool.retrieve(
+                    caloClusterRecoSequence, flags = None, RoIs=RoIs)
+        elif calib == "lcw":
+            tcSeq, clusterName = RecoFragmentsPool.retrieve(
+                    LCCaloClusterRecoSequence, flag = None, RoIs=RoIs)
 
         self.inputs = [tcSeq]
         self.fexAlg = self._make_fex_alg(
@@ -69,13 +74,18 @@ class TCPufitConfig(AlgConfig):
     def algType(cls):
         return "tcpufit"
 
-    def __init__(self, **recoDict):
-        super(TCPufitConfig, self).__init__(**recoDict)
-        from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
+    def __init__(self, calib, **recoDict):
+        super(TCPufitConfig, self).__init__(calib=calib, **recoDict)
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
+                caloClusterRecoSequence, LCCaloClusterRecoSequence)
         from TrigEFMissingET.TrigEFMissingETConf import HLT__MET__TCPufitFex
         RoIs = self.inputMaker.RoIs
-        tcSeq, clusterName = RecoFragmentsPool.retrieve(
-                HLTFSTopoRecoSequence, RoIs)
+        if calib == "em": 
+            tcSeq, clusterName = RecoFragmentsPool.retrieve(
+                    caloClusterRecoSequence, flags=None, RoIs=RoIs)
+        elif calib == "lcw":
+            tcSeq, clusterName = RecoFragmentsPool.retrieve(
+                    LCCaloClusterRecoSequence, flags=None, RoIs=RoIs)
 
         self.inputs = [tcSeq]
         self.fexAlg = self._make_fex_alg(
@@ -146,7 +156,8 @@ class PFSumConfig(AlgConfig):
     def __init__(self, **recoDict):
         super(PFSumConfig, self).__init__(**recoDict)
 
-        from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
+                caloClusterRecoSequence)
         from eflowRec.PFHLTSequence import PFHLTSequence
         from ..Jet.JetRecoConfiguration import defineJetConstit
         from TrigEFMissingET.TrigEFMissingETConf import HLT__MET__PFSumFex
@@ -156,7 +167,7 @@ class PFSumConfig(AlgConfig):
 
         RoIs = self.inputMaker.RoIs
         tcSeq, clusterName = RecoFragmentsPool.retrieve(
-                HLTFSTopoRecoSequence, RoIs)
+                caloClusterRecoSequence, flags=None, RoIs=RoIs)
         pfseq, pfoPrefix = RecoFragmentsPool.retrieve(
                 PFHLTSequence, None, clustersin = clusterName, tracktype="ftf")
         constit = defineJetConstit(jetRecoDict, pfoPrefix=pfoPrefix)