diff --git a/SAS/DataManagement/Cleanup/CleanupService/service.py b/SAS/DataManagement/Cleanup/CleanupService/service.py
index 695d03a6398cfbea7514989bd163a60d3d726f52..6e90f2434c1ffc91142b065e7ede8bf4ab500af9 100644
--- a/SAS/DataManagement/Cleanup/CleanupService/service.py
+++ b/SAS/DataManagement/Cleanup/CleanupService/service.py
@@ -77,7 +77,7 @@ def _getPinnedStatuses():
 class CleanupHandler(ServiceMessageHandler):
     def __init__(self, mountpoint=CEP4_DATA_MOUNTPOINT):
         super().__init__()
-        self.mount_point = mountpoint
+        self.mountpoint = mountpoint
         self.path_resolver = None
         self._sqrpc = None
         self.event_bus = None
@@ -87,7 +87,7 @@ class CleanupHandler(ServiceMessageHandler):
 
         self.path_resolver = PathResolver(mountpoint=self.mountpoint, exchange=exchange, broker=broker)
         self.event_bus = ToBus(exchange=exchange, broker=broker)
-        self._sqrpc = StorageQueryRPC(exchange=exchange, broker=broker)
+        self._sqrpc = StorageQueryRPC.create(exchange=exchange, broker=broker)
 
         self.register_service_method('GetPathForOTDBId', self.path_resolver.getPathForOTDBId)
         self.register_service_method('RemovePath', self._removePath)
@@ -375,8 +375,7 @@ def main():
                         level=logging.DEBUG if options.verbose else logging.INFO)
 
     with createService(exchange=options.exchange,
-                       broker=options.broker,
-                       verbose=options.verbose):
+                       broker=options.broker):
         waitForInterrupt()
 
 if __name__ == '__main__':