diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
index eb20d2b92eac63509321d235ca7aec8543050fb0..d05293b33992bdd8b62ee0ce127a718485d2be50 100755
--- a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef BYTESTREAMCNVSVCBASE_BYTESTREAMCNVSVCBASE_H
@@ -37,15 +37,10 @@ public:
    /// Checks whether an IOpaqueAddress is a GenericAddress
    virtual StatusCode updateServiceState(IOpaqueAddress* pAddress) override;
 
-   /// Implementation of IByteStreamEventAccess: Get RawEvent
-   virtual RawEventWrite* getRawEvent() override { return m_rawEventWrite; }
-
    /// Implementation of IIncidentListener: Handle for EndEvent incidence
    virtual void handle(const Incident&) override;
 
 protected: // data
-   RawEventWrite* m_rawEventWrite;
-
    std::vector<std::string> m_initCnvs;
    std::vector<std::string> m_ROD2ROBmap;
 };
diff --git a/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx b/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
index c231f5d85354b884e2e4fbded5c1a8f2ae445fd9..cadfc55bfa28589e4dd71b5c706f60840276a736 100755
--- a/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
@@ -16,8 +16,8 @@
 
 //______________________________________________________________________________
 ByteStreamCnvSvcBase::ByteStreamCnvSvcBase(const std::string& name, ISvcLocator* pSvcLocator) :
-   ::AthCnvSvc(name, pSvcLocator, ByteStreamAddress::storageType()),
-	m_rawEventWrite(0) {
+   ::AthCnvSvc(name, pSvcLocator, ByteStreamAddress::storageType())
+{
    declareProperty("InitCnvs", m_initCnvs); 
    // This property is used by Tile BS converter, not by this class.
    declareProperty("ROD2ROBmap", m_ROD2ROBmap);
diff --git a/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx b/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
index 5d0e6d9f0c994445bca57feeb1966b55c802f266..dec5cd347e92e9138602683e2f03dd814e196884 100644
--- a/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
@@ -1,9 +1,7 @@
-#include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
 #include "ByteStreamCnvSvcBase/ByteStreamAddressProviderSvc.h"
 #include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
 #include "../ROBDataProviderMTTest.h"
 
-DECLARE_COMPONENT( ByteStreamCnvSvcBase )
 DECLARE_COMPONENT( ByteStreamAddressProviderSvc )
 DECLARE_COMPONENT( ROBDataProviderSvc )
 DECLARE_COMPONENT( ROBDataProviderMTTest )