diff --git a/CUDADataFormats/BeamSpot/src/classes.h b/CUDADataFormats/BeamSpot/src/classes.h
deleted file mode 100644
index 5aebe536f8a01..0000000000000
--- a/CUDADataFormats/BeamSpot/src/classes.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CUDADataFormats_BeamSpot_classes_h
-#define CUDADataFormats_BeamSpot_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/BeamSpot/interface/BeamSpotCUDA.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_BeamSpot_classes_h
diff --git a/CUDADataFormats/BeamSpot/src/classes_def.xml b/CUDADataFormats/BeamSpot/src/classes_def.xml
deleted file mode 100644
index 198edeebe7c73..0000000000000
--- a/CUDADataFormats/BeamSpot/src/classes_def.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/CUDADataFormats/CaloCommon/src/classes.h b/CUDADataFormats/CaloCommon/src/classes.h
deleted file mode 100644
index 8eff4378875a9..0000000000000
--- a/CUDADataFormats/CaloCommon/src/classes.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "CUDADataFormats/CaloCommon/interface/Common.h"
diff --git a/CUDADataFormats/CaloCommon/src/classes_def.xml b/CUDADataFormats/CaloCommon/src/classes_def.xml
deleted file mode 100644
index 42705eef59f18..0000000000000
--- a/CUDADataFormats/CaloCommon/src/classes_def.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/EcalDigi/src/classes.h b/CUDADataFormats/EcalDigi/src/classes.h
deleted file mode 100644
index cd60b775e229b..0000000000000
--- a/CUDADataFormats/EcalDigi/src/classes.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/EcalDigi/interface/DigisCollection.h"
-#include "DataFormats/Common/interface/Wrapper.h"
diff --git a/CUDADataFormats/EcalDigi/src/classes_def.xml b/CUDADataFormats/EcalDigi/src/classes_def.xml
deleted file mode 100644
index 6a3adfe4b41c5..0000000000000
--- a/CUDADataFormats/EcalDigi/src/classes_def.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/CUDADataFormats/EcalRecHitSoA/src/classes.h b/CUDADataFormats/EcalRecHitSoA/src/classes.h
deleted file mode 100644
index ef95da461e3ba..0000000000000
--- a/CUDADataFormats/EcalRecHitSoA/src/classes.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/EcalRecHitSoA/interface/EcalRecHit.h"
-#include "CUDADataFormats/EcalRecHitSoA/interface/EcalUncalibratedRecHit.h"
-#include "DataFormats/Common/interface/Wrapper.h"
diff --git a/CUDADataFormats/EcalRecHitSoA/src/classes_def.xml b/CUDADataFormats/EcalRecHitSoA/src/classes_def.xml
deleted file mode 100644
index 27e315b2c2822..0000000000000
--- a/CUDADataFormats/EcalRecHitSoA/src/classes_def.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/HGCal/src/classes.h b/CUDADataFormats/HGCal/src/classes.h
deleted file mode 100644
index 982faea57d046..0000000000000
--- a/CUDADataFormats/HGCal/src/classes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HGCRECHITSOA_CLASSES_H
-#define HGCRECHITSOA_CLASSES_H
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "CUDADataFormats/HGCal/interface/HGCRecHitGPUProduct.h"
-#include "CUDADataFormats/HGCal/interface/HGCRecHitCPUProduct.h"
-
-#endif //HGCRECHITSOA_CLASSES_H
diff --git a/CUDADataFormats/HGCal/src/classes_def.xml b/CUDADataFormats/HGCal/src/classes_def.xml
deleted file mode 100644
index 632364292ff28..0000000000000
--- a/CUDADataFormats/HGCal/src/classes_def.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/PortableTestObjects/src/classes.h b/CUDADataFormats/PortableTestObjects/src/classes.h
deleted file mode 100644
index 6f26217bd6646..0000000000000
--- a/CUDADataFormats/PortableTestObjects/src/classes.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/PortableTestObjects/interface/TestDeviceCollection.h"
-#include "CUDADataFormats/PortableTestObjects/interface/TestHostCollection.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/PortableTestObjects/interface/TestSoA.h"
diff --git a/CUDADataFormats/PortableTestObjects/src/classes_def.xml b/CUDADataFormats/PortableTestObjects/src/classes_def.xml
deleted file mode 100644
index a0d9d557d2f39..0000000000000
--- a/CUDADataFormats/PortableTestObjects/src/classes_def.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/SiPixelCluster/src/classes.h b/CUDADataFormats/SiPixelCluster/src/classes.h
deleted file mode 100644
index 3eee5a1fce009..0000000000000
--- a/CUDADataFormats/SiPixelCluster/src/classes.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CUDADataFormats_SiPixelCluster_src_classes_h
-#define CUDADataFormats_SiPixelCluster_src_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_SiPixelCluster_src_classes_h
diff --git a/CUDADataFormats/SiPixelCluster/src/classes_def.xml b/CUDADataFormats/SiPixelCluster/src/classes_def.xml
deleted file mode 100644
index 70decb9f27df7..0000000000000
--- a/CUDADataFormats/SiPixelCluster/src/classes_def.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/CUDADataFormats/SiPixelDigi/src/classes.h b/CUDADataFormats/SiPixelDigi/src/classes.h
deleted file mode 100644
index fc5d318fad688..0000000000000
--- a/CUDADataFormats/SiPixelDigi/src/classes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CUDADataFormats_SiPixelDigi_src_classes_h
-#define CUDADataFormats_SiPixelDigi_src_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h"
-#include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_SiPixelDigi_src_classes_h
diff --git a/CUDADataFormats/SiPixelDigi/src/classes_def.xml b/CUDADataFormats/SiPixelDigi/src/classes_def.xml
deleted file mode 100644
index ff775afdc2046..0000000000000
--- a/CUDADataFormats/SiPixelDigi/src/classes_def.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/SiStripCluster/src/classes.h b/CUDADataFormats/SiStripCluster/src/classes.h
deleted file mode 100644
index b38f397dee067..0000000000000
--- a/CUDADataFormats/SiStripCluster/src/classes.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CUDADataFormats_SiStripCluster_classes_h
-#define CUDADataFormats_SiStripCluster_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/SiStripCluster/interface/SiStripClustersCUDA.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif
diff --git a/CUDADataFormats/SiStripCluster/src/classes_def.xml b/CUDADataFormats/SiStripCluster/src/classes_def.xml
deleted file mode 100644
index 3c2f3ab27c620..0000000000000
--- a/CUDADataFormats/SiStripCluster/src/classes_def.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/CUDADataFormats/StdDictionaries/BuildFile.xml b/CUDADataFormats/StdDictionaries/BuildFile.xml
deleted file mode 100644
index 0a1542b3b05c6..0000000000000
--- a/CUDADataFormats/StdDictionaries/BuildFile.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/CUDADataFormats/StdDictionaries/src/classes.h b/CUDADataFormats/StdDictionaries/src/classes.h
deleted file mode 100644
index 9c4e1d810c3c2..0000000000000
--- a/CUDADataFormats/StdDictionaries/src/classes.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include
-#include
-
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
diff --git a/CUDADataFormats/StdDictionaries/src/classes_def.xml b/CUDADataFormats/StdDictionaries/src/classes_def.xml
deleted file mode 100644
index 7dbf5e8175b4a..0000000000000
--- a/CUDADataFormats/StdDictionaries/src/classes_def.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/Track/src/classes.h b/CUDADataFormats/Track/src/classes.h
deleted file mode 100644
index 2e07adddcddd0..0000000000000
--- a/CUDADataFormats/Track/src/classes.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CUDADataFormats_Track_src_classes_h
-#define CUDADataFormats_Track_src_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/Common/interface/HostProduct.h"
-
-#include "CUDADataFormats/Track/interface/TrackSoAHeterogeneousDevice.h"
-#include "CUDADataFormats/Track/interface/TrackSoAHeterogeneousHost.h"
-
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_Track_src_classes_h
diff --git a/CUDADataFormats/Track/src/classes_def.xml b/CUDADataFormats/Track/src/classes_def.xml
deleted file mode 100644
index 5314f3f20b0d7..0000000000000
--- a/CUDADataFormats/Track/src/classes_def.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/TrackingRecHit/src/classes.h b/CUDADataFormats/TrackingRecHit/src/classes.h
deleted file mode 100644
index 1f494d0517450..0000000000000
--- a/CUDADataFormats/TrackingRecHit/src/classes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CUDADataFormats_TrackingRecHit_src_classes_h
-#define CUDADataFormats_TrackingRecHit_src_classes_h
-
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "CUDADataFormats/TrackingRecHit/interface/TrackingRecHitSoAHost.h"
-#include "CUDADataFormats/TrackingRecHit/interface/TrackingRecHitSoADevice.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_TrackingRecHit_src_classes_h
diff --git a/CUDADataFormats/TrackingRecHit/src/classes_def.xml b/CUDADataFormats/TrackingRecHit/src/classes_def.xml
deleted file mode 100644
index dfc2c6d748e0f..0000000000000
--- a/CUDADataFormats/TrackingRecHit/src/classes_def.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/Vertex/src/classes.h b/CUDADataFormats/Vertex/src/classes.h
deleted file mode 100644
index 0340affffa06c..0000000000000
--- a/CUDADataFormats/Vertex/src/classes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CUDADataFormats_Vertex_src_classes_h
-#define CUDADataFormats_Vertex_src_classes_h
-
-#include "CUDADataFormats/Vertex/interface/ZVertexSoAHeterogeneousDevice.h"
-#include "CUDADataFormats/Vertex/interface/ZVertexSoAHeterogeneousHost.h"
-#include "CUDADataFormats/Common/interface/Product.h"
-#include "DataFormats/Common/interface/Wrapper.h"
-
-#endif // CUDADataFormats_Vertex_src_classes_h
diff --git a/CUDADataFormats/Vertex/src/classes_def.xml b/CUDADataFormats/Vertex/src/classes_def.xml
deleted file mode 100644
index 63bd5a1cc94a7..0000000000000
--- a/CUDADataFormats/Vertex/src/classes_def.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-