diff --git a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
index 5e3263443e5fcc16a864ec219956b516f1dd32a9..55931d32c715e41b22c094667bcbc8b4ad09be3c 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_add_component(FaserActsKalmanFilter
     ActsTrackSeedTool.h
     CircleFit.h
     CircleFitTrackSeedTool.h
-    CKF2.h
+#todo    CKF2.h
     # CKF2Alignment.h
     CombinatorialKalmanFilterAlg.h
     EffPlotTool.h
@@ -53,19 +53,19 @@ atlas_add_component(FaserActsKalmanFilter
     PerformanceWriterTool.h
     PlotHelpers.h
     ResPlotTool.h
-    RootTrajectoryStatesWriterTool.h
-    RootTrajectorySummaryWriterTool.h
+#todo    RootTrajectoryStatesWriterTool.h
+#todo    RootTrajectorySummaryWriterTool.h
     SeedingAlg.h
 #    SegmentFitClusterTrackFinderTool.h
 #    SegmentFitTrackFinderTool.h
     SimWriterTool.h
-    SPSeedBasedInitialParameterTool.h
-    SPSimpleInitialParameterTool.h
+#todo    SPSeedBasedInitialParameterTool.h
+#todo    SPSimpleInitialParameterTool.h
     SummaryPlotTool.h
     TrackClassification.h
     TrackSeedWriterTool.h
     TrackSelection.h
-    TrajectoryWriterTool.h
+#todo    TrajectoryWriterTool.h
 #    ProtoTrackWriterTool.h
     TruthBasedInitialParameterTool.h
 #    TruthSeededTrackFinderTool.h
@@ -73,13 +73,13 @@ atlas_add_component(FaserActsKalmanFilter
     src/ActsTrackSeedTool.cxx
     src/CircleFit.cxx
     src/CircleFitTrackSeedTool.cxx
-    src/CKF2.cxx
+#todo    src/CKF2.cxx
     # src/CKF2Alignment.cxx
     src/CreateTrkTrackTool.h
     src/CreateTrkTrackTool.cxx
 #    src/ClusterTrackSeedTool.cxx
-    src/CombinatorialKalmanFilterAlg.cxx
-    src/EffPlotTool.cxx
+#todo    src/CombinatorialKalmanFilterAlg.cxx
+#todo    src/EffPlotTool.cxx
     src/FaserActsKalmanFilterAlg.cxx
     src/FiducialParticleTool.h
     src/FiducialParticleTool.cxx
@@ -87,21 +87,21 @@ atlas_add_component(FaserActsKalmanFilter
     src/MyTrackSeedTool.cxx
     src/KalmanFitterTool.cxx
 #    src/MultiTrackFinderTool.cxx
-    src/PerformanceWriterTool.cxx
+#todo    src/PerformanceWriterTool.cxx
     src/PlotHelpers.cxx
-    src/ResPlotTool.cxx
+#todo    src/ResPlotTool.cxx
     src/SeedingAlg.cxx
-    src/RootTrajectoryStatesWriterTool.cxx
-    src/RootTrajectorySummaryWriterTool.cxx
+#todo    src/RootTrajectoryStatesWriterTool.cxx
+#todo    src/RootTrajectorySummaryWriterTool.cxx
 #    src/SegmentFitClusterTrackFinderTool.cxx
 #    src/SegmentFitTrackFinderTool.cxx
     src/SimWriterTool.cxx
-    src/SPSeedBasedInitialParameterTool.cxx
-    src/SPSimpleInitialParameterTool.cxx
+#todo    src/SPSeedBasedInitialParameterTool.cxx
+#todo    src/SPSimpleInitialParameterTool.cxx
 #    src/ProtoTrackWriterTool.cxx
-    src/TrackFindingAlgorithmFunction.cxx
+#todo    src/TrackFindingAlgorithmFunction.cxx
     src/TrackFittingFunction.cxx
-    src/TrajectoryWriterTool.cxx
+#todo    src/TrajectoryWriterTool.cxx
     src/TruthBasedInitialParameterTool.cxx
     src/SummaryPlotTool.cxx
     src/TrackClassification.cxx
@@ -112,7 +112,7 @@ atlas_add_component(FaserActsKalmanFilter
 #    src/TruthTrackFinderTool.cxx
 #    src/TruthSeededTrackFinderTool.cxx
     src/ThreeStationTrackSeedTool.cxx
-    src/components/FaserActsKalmanFilter_entries.cxx
+#todo    src/components/FaserActsKalmanFilter_entries.cxx
     PUBLIC_HEADERS FaserActsKalmanFilter
     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackTruthMatchingTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackTruthMatchingTool.cxx
index 502faa3d4bb4dde421f63d2105f8d5525c67a0be..286cb31f225319ad2db00e978a6176ded4002540 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackTruthMatchingTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackTruthMatchingTool.cxx
@@ -89,7 +89,8 @@ void TrackTruthMatchingTool::identifyContributingParticles(
         continue;
       const auto &deposits = simDataCollection.at(id).getdeposits();
       for (const TrackerSimData::Deposit &deposit : deposits) {
-        int barcode = deposit.first->barcode();
+        //int barcode = deposit.first->barcode();
+        int barcode = deposit.first->id();
         // count each barcode only once for a wafer
         if (std::find(barcodes.begin(), barcodes.end(), barcode) ==
             barcodes.end()) {
diff --git a/package_filters.txt b/package_filters.txt
index c284cbcef15d14accf6e65e817137f617ce0da1c..82549fe7d8a7e3869d9271fb2801cf75104f8e4f 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -141,6 +141,7 @@
 +Tracking/Acts/FaserActsGeometry
 +Tracking/Acts/FaserActsGeometryInterfaces
 +Tracking/Acts/ActsInterop
++Tracking/Acts/FaserActsKalmanFilter
 +Tracking/TrkEventCnv/TrkEventAthenaPool
 +Tracking/TrkEventCnv/TrkEventCnvTools
 +Tracking/TrkEventCnv/TrkEventTopLevelCnv