diff --git a/CommonTools/MVAUtils/BuildFile.xml b/CommonTools/MVAUtils/BuildFile.xml
index c6e15e70055d6..9c7589c0a58b1 100644
--- a/CommonTools/MVAUtils/BuildFile.xml
+++ b/CommonTools/MVAUtils/BuildFile.xml
@@ -1,4 +1,3 @@
-
diff --git a/CommonTools/RecoAlgos/plugins/BuildFile.xml b/CommonTools/RecoAlgos/plugins/BuildFile.xml
index 1391d81bd6a18..14976ed78b0e4 100644
--- a/CommonTools/RecoAlgos/plugins/BuildFile.xml
+++ b/CommonTools/RecoAlgos/plugins/BuildFile.xml
@@ -16,5 +16,4 @@
-
diff --git a/DQM/SiPixelMonitorCluster/BuildFile.xml b/DQM/SiPixelMonitorCluster/BuildFile.xml
index f317bf3773a72..696e1ce65a1d6 100644
--- a/DQM/SiPixelMonitorCluster/BuildFile.xml
+++ b/DQM/SiPixelMonitorCluster/BuildFile.xml
@@ -1,5 +1,4 @@
-
diff --git a/DQM/SiPixelMonitorTrack/BuildFile.xml b/DQM/SiPixelMonitorTrack/BuildFile.xml
index e95a45b7debcb..0a2e6d3eb2130 100644
--- a/DQM/SiPixelMonitorTrack/BuildFile.xml
+++ b/DQM/SiPixelMonitorTrack/BuildFile.xml
@@ -1,5 +1,4 @@
-
@@ -11,7 +10,6 @@
-
diff --git a/EventFilter/HcalRawToDigi/bin/BuildFile.xml b/EventFilter/HcalRawToDigi/bin/BuildFile.xml
index 7a24968df89c8..c074e16ef4eab 100644
--- a/EventFilter/HcalRawToDigi/bin/BuildFile.xml
+++ b/EventFilter/HcalRawToDigi/bin/BuildFile.xml
@@ -3,6 +3,5 @@
-
diff --git a/EventFilter/HcalRawToDigi/plugins/BuildFile.xml b/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
index 3077a68a665e4..aa66a2cb81bdf 100644
--- a/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
@@ -18,8 +18,6 @@
-
-
diff --git a/PhysicsTools/NanoAOD/plugins/BuildFile.xml b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
index a379002d70904..b66dea70dbb0e 100644
--- a/PhysicsTools/NanoAOD/plugins/BuildFile.xml
+++ b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
@@ -21,7 +21,6 @@
-
diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml b/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
index bc5a46ca4ce24..7216793702c17 100644
--- a/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
@@ -7,14 +7,11 @@
-
-
-
diff --git a/RecoEgamma/Examples/plugins/BuildFile.xml b/RecoEgamma/Examples/plugins/BuildFile.xml
index b59607c7a476c..f2bf80e5412a6 100644
--- a/RecoEgamma/Examples/plugins/BuildFile.xml
+++ b/RecoEgamma/Examples/plugins/BuildFile.xml
@@ -1,7 +1,5 @@
-
-
@@ -31,15 +29,11 @@
-
-
-
-
diff --git a/RecoLocalCalo/HcalRecAlgos/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
index 2c2ee20aff7d5..2a00e076f08e4 100644
--- a/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
@@ -4,9 +4,6 @@
-
-
-
@@ -17,7 +14,6 @@
-
diff --git a/RecoLocalCalo/HcalRecProducers/BuildFile.xml b/RecoLocalCalo/HcalRecProducers/BuildFile.xml
index e34037ecbcbb5..3907af6817621 100644
--- a/RecoLocalCalo/HcalRecProducers/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecProducers/BuildFile.xml
@@ -1,7 +1,5 @@
-
-
@@ -14,12 +12,10 @@
-
-
diff --git a/RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml b/RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml
index a804a7fe4b70e..2b1079ddb6874 100644
--- a/RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/SimCalorimetry/HGCalSimProducers/BuildFile.xml b/SimCalorimetry/HGCalSimProducers/BuildFile.xml
index 7e74720874e7c..6860254dcc3b5 100644
--- a/SimCalorimetry/HGCalSimProducers/BuildFile.xml
+++ b/SimCalorimetry/HGCalSimProducers/BuildFile.xml
@@ -1,10 +1,7 @@
-
-
-
diff --git a/SimCalorimetry/HGCalSimProducers/plugins/BuildFile.xml b/SimCalorimetry/HGCalSimProducers/plugins/BuildFile.xml
index 10210b61c0be2..7c684aac304c7 100644
--- a/SimCalorimetry/HGCalSimProducers/plugins/BuildFile.xml
+++ b/SimCalorimetry/HGCalSimProducers/plugins/BuildFile.xml
@@ -1,7 +1,9 @@
+
+
+
-
diff --git a/SimDataFormats/Associations/plugins/BuildFile.xml b/SimDataFormats/Associations/plugins/BuildFile.xml
index 7f2eb2e2b1f29..bd62ae6ee8f1b 100644
--- a/SimDataFormats/Associations/plugins/BuildFile.xml
+++ b/SimDataFormats/Associations/plugins/BuildFile.xml
@@ -1,8 +1,5 @@
-
-
-
diff --git a/SimG4Core/Application/plugins/BuildFile.xml b/SimG4Core/Application/plugins/BuildFile.xml
index de5e2daf694f2..22a53115d9517 100644
--- a/SimG4Core/Application/plugins/BuildFile.xml
+++ b/SimG4Core/Application/plugins/BuildFile.xml
@@ -1,7 +1,5 @@
-
-
diff --git a/Validation/SiPixelPhase1TrackClustersV/BuildFile.xml b/Validation/SiPixelPhase1TrackClustersV/BuildFile.xml
index b81fd8ad3ac79..f879872266a2a 100644
--- a/Validation/SiPixelPhase1TrackClustersV/BuildFile.xml
+++ b/Validation/SiPixelPhase1TrackClustersV/BuildFile.xml
@@ -1,4 +1,2 @@
-
-