diff --git a/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/DiskCleaner.java b/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/DiskCleaner.java
index c09b2b601d3..fdae8aaa4e1 100644
--- a/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/DiskCleaner.java
+++ b/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/DiskCleaner.java
@@ -89,11 +89,9 @@ public void setReportRemove(String[] reportRemove) {
 
     /**
      * runDelete Delete files on each pool from the poolList.
-     *
-     * @throws InterruptedException
      */
     @Override
-    protected void runDelete() throws InterruptedException {
+    protected void runDelete() {
         if (!_hasHaLeadership) {
             LOGGER.warn("Delete run triggered despite not having leadership. "
                   + "We assume this is a transient problem.");
diff --git a/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/PoolInformationBase.java b/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/PoolInformationBase.java
index 79bdf81fab2..0b2221c1538 100644
--- a/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/PoolInformationBase.java
+++ b/modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/PoolInformationBase.java
@@ -5,8 +5,7 @@
 import dmg.cells.nucleus.CellMessageReceiver;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.dcache.util.Args;
 
 /**
@@ -25,12 +24,12 @@ public class PoolInformationBase implements CellMessageReceiver {
     /**
      * Map of all pools currently up.
      */
-    private final Map<String, PoolInformation> _pools = new HashMap<>();
+    private final ConcurrentHashMap<String, PoolInformation> _pools = new ConcurrentHashMap<>();
 
     /**
      * Map from HSM instance name to the set of pools attached to that HSM.
      */
-    private final Map<String, Collection<PoolInformation>> _hsmToPool = new HashMap<>();
+    private final ConcurrentHashMap<String, Collection<PoolInformation>> _hsmToPool = new ConcurrentHashMap<>();
 
     /**
      *