diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
index 7920ec8c8495c..525912377ae6d 100644
--- a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
@@ -6,7 +6,6 @@
  *
  ****************************************************************************/
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
index 0e6aacbf3d438..e7a4e6d5bba6c 100644
--- a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -9,7 +9,6 @@
 *
 ****************************************************************************/
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
diff --git a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc
index 910082fc8b875..121fee3edc216 100644
--- a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc
@@ -7,7 +7,6 @@
  *
  *******************************************/
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc b/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc
index 514fdd610b99a..9c3734d8e8e96 100644
--- a/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc
@@ -6,7 +6,6 @@
  *
  *******************************************/
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -18,13 +17,9 @@
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 
-#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h"
 #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h"
+#include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h"
 #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigi.h"
-#include "DataFormats/CTPPSDigi/interface/CTPPSPixelDataError.h"
-#include "DataFormats/CTPPSReco/interface/CTPPSPixelCluster.h"
-#include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 #include <string>
 
@@ -196,7 +191,7 @@ void CTPPSRandomDQMSource::analyze(edm::Event const &event, edm::EventSetup cons
 
 void CTPPSRandomDQMSource::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("tagRPixDigi", edm::InputTag("ctppsPixelDigisAlCaRecoProducer"));
+  desc.add<edm::InputTag>("tagRPixDigi", edm::InputTag("ctppsPixelDigisAlCaRecoProducer", ""));
   desc.addUntracked<std::string>("folderName", "PPSRANDOM/RandomPixel");
   desc.addUntracked<unsigned int>("RPStatusWord", 0x8008);
   descriptions.add("ctppsRandomDQMSource", desc);
diff --git a/DQM/CTPPS/python/ctppsRandomDQMSource_cfi.py b/DQM/CTPPS/python/ctppsRandomDQMSource_cfi.py
deleted file mode 100644
index d83a2ca8461cf..0000000000000
--- a/DQM/CTPPS/python/ctppsRandomDQMSource_cfi.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-
-ctppsRandomDQMSource = DQMEDAnalyzer('CTPPSRandomDQMSource',
-    tagRPixDigi = cms.InputTag("ctppsPixelDigisAlCaRecoProducer", ""),
-    folderName = cms.untracked.string("PPSRANDOM/RandomPixel"),
-    RPStatusWord = cms.untracked.uint32(0x8008) # rpots in readout:220_fr_hr; 210_fr_hr
-)
\ No newline at end of file