diff --git a/CalibTracker/SiStripHitEfficiency/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
index a979efa1460ed..b316880c073bd 100644
--- a/CalibTracker/SiStripHitEfficiency/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
@@ -1,7 +1,7 @@
 <use name="RecoLocalTracker/SiStripClusterizer"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="DataFormats/DetId"/>
-<use name="DataFormats/Scalers"/> <!--Needed for typeinfo for LumiScalers for UBSAN builds-->
+<use name="DataFormats/Scalers"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/TrackReco"/>
diff --git a/DQM/TrackerRemapper/BuildFile.xml b/DQM/TrackerRemapper/BuildFile.xml
index d071a57809cd2..6a01e78df0c6e 100644
--- a/DQM/TrackerRemapper/BuildFile.xml
+++ b/DQM/TrackerRemapper/BuildFile.xml
@@ -5,7 +5,7 @@
 <use name="rootgraphics"/>
 <use name="rootmath"/>
 <use name="roothistmatrix"/>
-<use name="roothistpainter"/> <!--Needed for typeinfo for TPaletteAxis in UBSAN builds-->
+<use name="roothistpainter"/> <!--Needed for TPaletteAxis and other classes for drawing histograms-->
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQMOffline/MuonDPG/BuildFile.xml b/DQMOffline/MuonDPG/BuildFile.xml
index 7abe7e426655f..3140fc068b8cc 100644
--- a/DQMOffline/MuonDPG/BuildFile.xml
+++ b/DQMOffline/MuonDPG/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="FWCore/Framework"/>
 <use name="DQMServices/Core"/>
-<use name="DataFormats/Scalers"/> <!--Needed for typeinfo for LumiScalers for UBSAN builds-->
 <use name="HLTrigger/HLTcore"/>
 <use name="boost"/>
 <use name="rootgraphics"/>
diff --git a/Geometry/MTDNumberingBuilder/BuildFile.xml b/Geometry/MTDNumberingBuilder/BuildFile.xml
index 6e3b0fcd58de6..307cacf5043a8 100644
--- a/Geometry/MTDNumberingBuilder/BuildFile.xml
+++ b/Geometry/MTDNumberingBuilder/BuildFile.xml
@@ -1,7 +1,7 @@
 <use name="DataFormats/GeometrySurface"/>
 <use name="DetectorDescription/Core"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
-<use name="Geometry/CommonDetUnit"/> <!--Needed for typeinfo for GeomDet in UBSAN builds-->
+<use name="Geometry/CommonDetUnit"/>
 <use name="DataFormats/ForwardDetId"/>
 <export>
   <lib name="1"/>