diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/exe/test.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/exe/test.cxx
index c35e3610e73a0159be92ea0276860ac1a6610836..0b0e7aaa6d5611a57e432fbf046039d413101345 100755
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/exe/test.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/exe/test.cxx
@@ -1,22 +1,18 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
  * main program for the Validation
  */
-// #include "MdtCalibValidation/MDTT0CalibrationHandler.h"
 #include "MdtCalibValidation/MdtT0ValidationHandler.h"
 
 int main()
 {
 
 // construct the default CalibrationManager
-  // MDTT0CalibrationHandler* ValHandl = new MDTT0CalibrationHandler::MDTT0CalibrationHandler;
   MdtT0ValidationHandler* ValHandl = new MdtT0ValidationHandler::MdtT0ValidationHandler;
   ValHandl->initialize();
-  // ValHandl->TestRootDB();
-  // ValHandl->FillTreeFromRootDB();
   ValHandl->execute();
   ValHandl->finalize();
   }
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 9a7107070e1b4d83e6cf19f43f886b523cdc7722..f16426834fe13bad69d8c3662959d07929d0ca94 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -69,5 +69,13 @@
 - LArCalorimeter/LArSim
 - PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
 
-# MdtCalibDbAsciiTool might be removed from athena, disable compilation
+# some MDT calibration tools which might be removed from athena, disable compilation
 - MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool
+- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools
+- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation
+- MuonSpectrometer/MuonCalib/MuonCalibAlgs
+- MuonSpectrometer/MuonCalib/MuonCalibDbScripts
+- MuonSpectrometer/MuonCalib/MuonCalibJobTransforms
+- MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg
+- MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools
+- MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools