diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
index b3a6c74c5c11d..a7283d419d1d0 100644
--- a/FWCore/Framework/interface/EDFilter.h
+++ b/FWCore/Framework/interface/EDFilter.h
@@ -1,126 +1,7 @@
 #ifndef FWCore_Framework_EDFilter_h
 #define FWCore_Framework_EDFilter_h
 
-/*----------------------------------------------------------------------
-  
-EDFilter: The base class of all "modules" used to control the flow of
-processing in a processing path.
-Filters can also insert products into the event.
-These products should be informational products about the filter decision.
-
-
-----------------------------------------------------------------------*/
-
-#include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/Framework/interface/EDConsumerBase.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
-
-#include "FWCore/Concurrency/interface/WaitingTaskHolder.h"
-#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include "DataFormats/Provenance/interface/ModuleDescription.h"
-#include "FWCore/Utilities/interface/deprecated_macro.h"
-
-#include <string>
-#include <vector>
-#include <array>
-
-namespace edm {
-  namespace maker {
-    template <typename T>
-    class ModuleHolderT;
-  }
-
-  class ModuleCallingContext;
-  class PreallocationConfiguration;
-  class ActivityRegistry;
-  class ThinnedAssociationsHelper;
-
-  /**
-   * The legacy EDFilter class is deprecated. We annotate the
-   * constructor only with the CMS_DEPRECATED, because with gcc it
-   * turns out to flag deriving classes more reliably than annotating
-   * the entire class.
-   */
-  class EDFilter : public ProducerBase, public EDConsumerBase {
-  public:
-    template <typename T>
-    friend class maker::ModuleHolderT;
-    template <typename T>
-    friend class WorkerT;
-    typedef EDFilter ModuleType;
-
-    CMS_DEPRECATED EDFilter();
-    ~EDFilter() override;
-
-    static void fillDescriptions(ConfigurationDescriptions& descriptions);
-    static void prevalidate(ConfigurationDescriptions&);
-
-    static const std::string& baseType();
-
-    // Warning: the returned moduleDescription will be invalid during construction
-    ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-
-    static bool wantsProcessBlocks() { return false; }
-    static bool wantsInputProcessBlocks() { return false; }
-    static bool wantsGlobalRuns() { return true; }
-    static bool wantsGlobalLuminosityBlocks() { return true; }
-    static bool wantsStreamRuns() { return false; }
-    static bool wantsStreamLuminosityBlocks() { return false; };
-
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
-
-  private:
-    bool doEvent(EventTransitionInfo const&, ActivityRegistry*, ModuleCallingContext const*);
-    //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTaskHolder, ModuleCallingContext const&, Principal const&) const {}
-
-    void doPreallocate(PreallocationConfiguration const&) {}
-    void doBeginJob();
-    void doEndJob();
-    void doBeginProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doAccessInputProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doEndProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doBeginRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doEndRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doBeginLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doEndLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doRespondToOpenInputFile(FileBlock const& fb);
-    void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRespondToCloseOutputFile() {}
-    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
-
-    void registerProductsAndCallbacks(EDFilter* module, ProductRegistry* reg) {
-      registerProducts(module, reg, moduleDescription_);
-    }
-
-    std::string workerType() const { return "WorkerT<EDFilter>"; }
-
-    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
-
-    virtual bool filter(Event&, EventSetup const&) = 0;
-    virtual void beginJob() {}
-    virtual void endJob() {}
-
-    virtual void beginRun(Run const&, EventSetup const&) {}
-    virtual void endRun(Run const&, EventSetup const&) {}
-    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
-    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
-    virtual void respondToOpenInputFile(FileBlock const&) {}
-    virtual void respondToCloseInputFile(FileBlock const&) {}
-
-    bool hasAcquire() const { return false; }
-    bool hasAccumulator() const { return false; }
-
-    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
-    ModuleDescription moduleDescription_;
-    std::vector<BranchID> previousParentage_;
-    SharedResourcesAcquirer resourceAcquirer_;
-    SerialTaskQueue runQueue_;
-    SerialTaskQueue luminosityBlockQueue_;
-    ParentageID previousParentageId_;
-  };
-}  // namespace edm
+#error \
+    "The use of edm::EDFilter has been removed. Please stop use of this header and switch module to a thread-friendly type."
 
 #endif
diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
index d91f5ebd215ee..1518bb3c31b18 100644
--- a/FWCore/Framework/interface/EDProducer.h
+++ b/FWCore/Framework/interface/EDProducer.h
@@ -1,121 +1,7 @@
 #ifndef FWCore_Framework_EDProducer_h
 #define FWCore_Framework_EDProducer_h
 
-/*----------------------------------------------------------------------
-
-EDProducer: The base class of "modules" whose main purpose is to insert new
-EDProducts into an Event.
-
-
-----------------------------------------------------------------------*/
-
-#include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/Framework/interface/EDConsumerBase.h"
-#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "DataFormats/Provenance/interface/ModuleDescription.h"
-#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include "FWCore/Concurrency/interface/WaitingTaskHolder.h"
-#include "FWCore/Utilities/interface/deprecated_macro.h"
-
-#include <string>
-#include <vector>
-
-namespace edm {
-
-  class ModuleCallingContext;
-  class PreallocationConfiguration;
-  class ActivityRegistry;
-  class ThinnedAssociationsHelper;
-
-  namespace maker {
-    template <typename T>
-    class ModuleHolderT;
-  }
-
-  /**
-   * The legacy EDProducer class is deprecated. We annotate the
-   * constructor only with the CMS_DEPRECATED, because with gcc it
-   * turns out to flag deriving classes more reliably than annotating
-   * the entire class.
-   */
-  class EDProducer : public ProducerBase, public EDConsumerBase {
-  public:
-    template <typename T>
-    friend class maker::ModuleHolderT;
-    template <typename T>
-    friend class WorkerT;
-    typedef EDProducer ModuleType;
-
-    CMS_DEPRECATED EDProducer();
-    ~EDProducer() override;
-
-    static void fillDescriptions(ConfigurationDescriptions& descriptions);
-    static void prevalidate(ConfigurationDescriptions& descriptions);
-    static const std::string& baseType();
-
-    // Warning: the returned moduleDescription will be invalid during construction
-    ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-
-    static bool wantsProcessBlocks() { return false; }
-    static bool wantsInputProcessBlocks() { return false; }
-    static bool wantsGlobalRuns() { return true; }
-    static bool wantsGlobalLuminosityBlocks() { return true; }
-    static bool wantsStreamRuns() { return false; }
-    static bool wantsStreamLuminosityBlocks() { return false; };
-
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
-
-  private:
-    bool doEvent(EventTransitionInfo const&, ActivityRegistry*, ModuleCallingContext const*);
-    //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTaskHolder, ModuleCallingContext const&, Principal const&) const {}
-
-    void doPreallocate(PreallocationConfiguration const&) {}
-    void doBeginJob();
-    void doEndJob();
-    void doBeginProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doAccessInputProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doEndProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doBeginRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doEndRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doBeginLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doEndLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doRespondToOpenInputFile(FileBlock const& fb);
-    void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRespondToCloseOutputFile() {}
-    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
-    void registerProductsAndCallbacks(EDProducer* module, ProductRegistry* reg) {
-      registerProducts(module, reg, moduleDescription_);
-    }
-
-    std::string workerType() const { return "WorkerT<EDProducer>"; }
-
-    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
-
-    virtual void produce(Event&, EventSetup const&) = 0;
-    virtual void beginJob() {}
-    virtual void endJob() {}
-
-    virtual void beginRun(Run const& /* iR */, EventSetup const& /* iE */) {}
-    virtual void endRun(Run const& /* iR */, EventSetup const& /* iE */) {}
-    virtual void beginLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */) {}
-    virtual void endLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */) {}
-    virtual void respondToOpenInputFile(FileBlock const&) {}
-    virtual void respondToCloseInputFile(FileBlock const&) {}
-
-    bool hasAcquire() const { return false; }
-    bool hasAccumulator() const { return false; }
-
-    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
-    ModuleDescription moduleDescription_;
-    std::vector<BranchID> previousParentage_;
-    SharedResourcesAcquirer resourceAcquirer_;
-    SerialTaskQueue runQueue_;
-    SerialTaskQueue luminosityBlockQueue_;
-    ParentageID previousParentageId_;
-  };
-}  // namespace edm
+#error \
+    "The use of edm::EDProducer has been removed. Please stop use of this header and switch module to a thread-friendly type."
 
 #endif
diff --git a/FWCore/Framework/interface/Frameworkfwd.h b/FWCore/Framework/interface/Frameworkfwd.h
index 894fc5f56f8fa..84aaf0365909c 100644
--- a/FWCore/Framework/interface/Frameworkfwd.h
+++ b/FWCore/Framework/interface/Frameworkfwd.h
@@ -16,7 +16,6 @@ namespace edm {
   class ConsumesCollector;
   class DelayedReader;
   class EDAnalyzer;
-  class EDFilter;
   class EDLooper;
   class EDProducer;
   class Event;
diff --git a/FWCore/Framework/interface/ProducerBase.h b/FWCore/Framework/interface/ProducerBase.h
index 7e11dd28ccfb9..6e76ff749e18a 100644
--- a/FWCore/Framework/interface/ProducerBase.h
+++ b/FWCore/Framework/interface/ProducerBase.h
@@ -29,7 +29,6 @@ namespace edm {
   class Run;
 
   class EDProducer;
-  class EDFilter;
   namespace one {
     class EDProducerBase;
     class EDFilterBase;
diff --git a/FWCore/Framework/src/EDFilter.cc b/FWCore/Framework/src/EDFilter.cc
deleted file mode 100644
index b48e7e171592b..0000000000000
--- a/FWCore/Framework/src/EDFilter.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*----------------------------------------------------------------------
-  
-
-----------------------------------------------------------------------*/
-
-#include "FWCore/Framework/interface/EDFilter.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/src/edmodule_mightGet_config.h"
-#include "FWCore/Framework/src/EventSignalsSentry.h"
-#include "FWCore/Framework/interface/TransitionInfoTypes.h"
-#include "FWCore/ServiceRegistry/interface/ESParentContext.h"
-
-#include "FWCore/Framework/interface/SharedResourcesRegistry.h"
-
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
-namespace edm {
-
-  EDFilter::EDFilter() : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {
-    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
-  }
-
-  EDFilter::~EDFilter() {}
-
-  bool EDFilter::doEvent(EventTransitionInfo const& info, ActivityRegistry* act, ModuleCallingContext const* mcc) {
-    bool rc = false;
-    Event e(info, moduleDescription_, mcc);
-    e.setConsumer(this);
-    e.setProducer(this, &previousParentage_);
-    e.setSharedResourcesAcquirer(&resourceAcquirer_);
-    EventSignalsSentry sentry(act, mcc);
-    ESParentContext parentC(mcc);
-    rc = this->filter(
-        e,
-        EventSetup{info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC});
-    commit_(e, &previousParentageId_);
-    return rc;
-  }
-
-  void EDFilter::doBeginJob() {
-    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
-    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
-
-    this->beginJob();
-  }
-
-  void EDFilter::doEndJob() { this->endJob(); }
-
-  void EDFilter::doBeginRun(RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    Run r(info, moduleDescription_, mcc, false);
-    r.setConsumer(this);
-    Run const& cnstR = r;
-    ESParentContext parentC(mcc);
-    this->beginRun(
-        cnstR,
-        EventSetup{
-            info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC});
-    commit_(r);
-    return;
-  }
-
-  void EDFilter::doEndRun(RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    Run r(info, moduleDescription_, mcc, true);
-    r.setConsumer(this);
-    Run const& cnstR = r;
-    ESParentContext parentC(mcc);
-    this->endRun(
-        cnstR,
-        EventSetup{
-            info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC});
-    commit_(r);
-    return;
-  }
-
-  void EDFilter::doBeginLuminosityBlock(LumiTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(info, moduleDescription_, mcc, false);
-    lb.setConsumer(this);
-    LuminosityBlock const& cnstLb = lb;
-    ESParentContext parentC(mcc);
-    this->beginLuminosityBlock(cnstLb,
-                               EventSetup{info,
-                                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
-                                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                                          parentC});
-    commit_(lb);
-  }
-
-  void EDFilter::doEndLuminosityBlock(LumiTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(info, moduleDescription_, mcc, true);
-    lb.setConsumer(this);
-    LuminosityBlock const& cnstLb = lb;
-    ESParentContext parentC(mcc);
-    this->endLuminosityBlock(cnstLb,
-                             EventSetup{info,
-                                        static_cast<unsigned int>(Transition::EndLuminosityBlock),
-                                        esGetTokenIndices(Transition::EndLuminosityBlock),
-                                        parentC});
-    commit_(lb);
-    return;
-  }
-
-  void EDFilter::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
-
-  void EDFilter::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
-
-  void EDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
-    ParameterSetDescription desc;
-    desc.setUnknown();
-    descriptions.addDefault(desc);
-  }
-
-  void EDFilter::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
-
-  static const std::string kBaseType("EDFilter");
-  const std::string& EDFilter::baseType() { return kBaseType; }
-}  // namespace edm
diff --git a/FWCore/Framework/src/EDProducer.cc b/FWCore/Framework/src/EDProducer.cc
deleted file mode 100644
index de2958db62732..0000000000000
--- a/FWCore/Framework/src/EDProducer.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/*----------------------------------------------------------------------
-  
-
-----------------------------------------------------------------------*/
-
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/src/edmodule_mightGet_config.h"
-#include "FWCore/Framework/src/EventSignalsSentry.h"
-#include "FWCore/Framework/interface/TransitionInfoTypes.h"
-#include "FWCore/ServiceRegistry/interface/ESParentContext.h"
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
-#include "FWCore/Framework/interface/SharedResourcesRegistry.h"
-
-namespace edm {
-  EDProducer::EDProducer() : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {
-    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
-  }
-
-  EDProducer::~EDProducer() {}
-
-  bool EDProducer::doEvent(EventTransitionInfo const& info, ActivityRegistry* act, ModuleCallingContext const* mcc) {
-    Event e(info, moduleDescription_, mcc);
-    e.setConsumer(this);
-    e.setProducer(this, &previousParentage_);
-    e.setSharedResourcesAcquirer(&resourceAcquirer_);
-    EventSignalsSentry sentry(act, mcc);
-    ESParentContext parentC(mcc);
-    const EventSetup c{
-        info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
-    this->produce(e, c);
-    commit_(e, &previousParentageId_);
-    return true;
-  }
-
-  void EDProducer::doBeginJob() {
-    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
-    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
-    this->beginJob();
-  }
-
-  void EDProducer::doEndJob() { this->endJob(); }
-
-  void EDProducer::doBeginRun(RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    Run r(info, moduleDescription_, mcc, false);
-    r.setConsumer(this);
-    Run const& cnstR = r;
-    ESParentContext parentC(mcc);
-    const EventSetup c{
-        info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
-    this->beginRun(cnstR, c);
-    commit_(r);
-  }
-
-  void EDProducer::doEndRun(RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    Run r(info, moduleDescription_, mcc, true);
-    r.setConsumer(this);
-    Run const& cnstR = r;
-    ESParentContext parentC(mcc);
-    const EventSetup c{
-        info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
-    this->endRun(cnstR, c);
-    commit_(r);
-  }
-
-  void EDProducer::doBeginLuminosityBlock(LumiTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(info, moduleDescription_, mcc, false);
-    lb.setConsumer(this);
-    LuminosityBlock const& cnstLb = lb;
-    ESParentContext parentC(mcc);
-    const EventSetup c{info,
-                       static_cast<unsigned int>(Transition::BeginLuminosityBlock),
-                       esGetTokenIndices(Transition::BeginLuminosityBlock),
-                       parentC};
-    this->beginLuminosityBlock(cnstLb, c);
-    commit_(lb);
-  }
-
-  void EDProducer::doEndLuminosityBlock(LumiTransitionInfo const& info, ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(info, moduleDescription_, mcc, true);
-    lb.setConsumer(this);
-    ESParentContext parentC(mcc);
-    const EventSetup c{info,
-                       static_cast<unsigned int>(Transition::EndLuminosityBlock),
-                       esGetTokenIndices(Transition::EndLuminosityBlock),
-                       parentC};
-    LuminosityBlock const& cnstLb = lb;
-    this->endLuminosityBlock(cnstLb, c);
-    commit_(lb);
-  }
-
-  void EDProducer::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
-
-  void EDProducer::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
-
-  void EDProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
-    ParameterSetDescription desc;
-    desc.setUnknown();
-    descriptions.addDefault(desc);
-  }
-
-  void EDProducer::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
-
-  static const std::string kBaseType("EDProducer");
-
-  const std::string& EDProducer::baseType() { return kBaseType; }
-}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerT.cc b/FWCore/Framework/src/WorkerT.cc
index 4a59c774ef381..755cc33819f97 100644
--- a/FWCore/Framework/src/WorkerT.cc
+++ b/FWCore/Framework/src/WorkerT.cc
@@ -1,8 +1,6 @@
 #include "FWCore/Framework/interface/maker/WorkerT.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/one/EDProducerBase.h"
 #include "FWCore/Framework/interface/one/EDFilterBase.h"
@@ -164,22 +162,6 @@ namespace edm {
     return nullptr;
   }
   template <>
-  SerialTaskQueue* WorkerT<EDProducer>::globalRunsQueue() {
-    return module_->globalRunsQueue();
-  }
-  template <>
-  SerialTaskQueue* WorkerT<EDProducer>::globalLuminosityBlocksQueue() {
-    return module_->globalLuminosityBlocksQueue();
-  }
-  template <>
-  SerialTaskQueue* WorkerT<EDFilter>::globalRunsQueue() {
-    return module_->globalRunsQueue();
-  }
-  template <>
-  SerialTaskQueue* WorkerT<EDFilter>::globalLuminosityBlocksQueue() {
-    return module_->globalLuminosityBlocksQueue();
-  }
-  template <>
   SerialTaskQueue* WorkerT<EDAnalyzer>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
@@ -287,18 +269,6 @@ namespace edm {
     iTask.doneWaiting(std::exception_ptr());
   }
 
-  template <>
-  inline void WorkerT<EDFilter>::implDoTransformAsync(WaitingTaskHolder task,
-                                                      size_t iTransformIndex,
-                                                      EventPrincipal const& iEvent,
-                                                      ParentContext const& iParent,
-                                                      ServiceWeakToken const& weakToken) {}
-  template <>
-  inline void WorkerT<EDProducer>::implDoTransformAsync(WaitingTaskHolder task,
-                                                        size_t iTransformIndex,
-                                                        EventPrincipal const& iEvent,
-                                                        ParentContext const& iParent,
-                                                        ServiceWeakToken const& weakToken) {}
   template <>
   inline void WorkerT<EDAnalyzer>::implDoTransformAsync(WaitingTaskHolder task,
                                                         size_t iTransformIndex,
@@ -674,14 +644,6 @@ namespace edm {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
   template <>
-  Worker::TaskQueueAdaptor WorkerT<EDFilter>::serializeRunModule() {
-    return &(module_->sharedResourcesAcquirer().serialQueueChain());
-  }
-  template <>
-  Worker::TaskQueueAdaptor WorkerT<EDProducer>::serializeRunModule() {
-    return &(module_->sharedResourcesAcquirer().serialQueueChain());
-  }
-  template <>
   Worker::TaskQueueAdaptor WorkerT<one::EDAnalyzerBase>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
@@ -722,14 +684,6 @@ namespace edm {
     bool mustPrefetchMayGet<EDAnalyzer>() {
       return true;
     }
-    template <>
-    bool mustPrefetchMayGet<EDProducer>() {
-      return true;
-    }
-    template <>
-    bool mustPrefetchMayGet<EDFilter>() {
-      return true;
-    }
 
     template <>
     bool mustPrefetchMayGet<edm::one::EDProducerBase>() {
@@ -858,14 +812,6 @@ namespace edm {
     return Worker::kAnalyzer;
   }
   template <>
-  Worker::Types WorkerT<EDProducer>::moduleType() const {
-    return Worker::kProducer;
-  }
-  template <>
-  Worker::Types WorkerT<EDFilter>::moduleType() const {
-    return Worker::kFilter;
-  }
-  template <>
   Worker::Types WorkerT<edm::one::EDProducerBase>::moduleType() const {
     return Worker::kProducer;
   }
@@ -934,14 +880,6 @@ namespace edm {
     return Worker::kLegacy;
   }
   template <>
-  Worker::ConcurrencyTypes WorkerT<EDProducer>::moduleConcurrencyType() const {
-    return Worker::kLegacy;
-  }
-  template <>
-  Worker::ConcurrencyTypes WorkerT<EDFilter>::moduleConcurrencyType() const {
-    return Worker::kLegacy;
-  }
-  template <>
   Worker::ConcurrencyTypes WorkerT<edm::one::EDProducerBase>::moduleConcurrencyType() const {
     return Worker::kOne;
   }
@@ -1007,8 +945,6 @@ namespace edm {
 
   //Explicitly instantiate our needed templates to avoid having the compiler
   // instantiate them in all of our libraries
-  template class WorkerT<EDProducer>;
-  template class WorkerT<EDFilter>;
   template class WorkerT<EDAnalyzer>;
   template class WorkerT<one::EDProducerBase>;
   template class WorkerT<one::EDFilterBase>;
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
index 23c71ecc236c4..35a1ca9ef0a65 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
@@ -31,7 +31,6 @@ and query the component for its allowed ParameterSetDescription.
 
 namespace edm {
   class EDProducer;
-  class EDFilter;
   class EDAnalyzer;
 
   namespace one {
@@ -106,7 +105,6 @@ namespace edm {
 
     static const std::string& extendedBaseType(EDAnalyzer const*) { return kExtendedBaseForEDAnalyzer; }
     static const std::string& extendedBaseType(EDProducer const*) { return kExtendedBaseForEDProducer; }
-    static const std::string& extendedBaseType(EDFilter const*) { return kExtendedBaseForEDFilter; }
     static const std::string& extendedBaseType(one::EDAnalyzerBase const*) { return kExtendedBaseForOneEDAnalyzer; }
     static const std::string& extendedBaseType(one::EDProducerBase const*) { return kExtendedBaseForOneEDProducer; }
     static const std::string& extendedBaseType(one::EDFilterBase const*) { return kExtendedBaseForOneEDFilter; }