diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/impl/BytesMarshallableReaderWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/BytesMarshallableReaderWriter.java
index 36c44ab3a..f7496be4c 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/impl/BytesMarshallableReaderWriter.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/BytesMarshallableReaderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.hash.serialization.impl;
@@ -8,12 +8,7 @@ import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.BytesMarshallable;
 import net.openhft.chronicle.bytes.BytesStore;
 import net.openhft.chronicle.bytes.VanillaBytes;
-import net.openhft.chronicle.hash.serialization.SizedReader;
-import net.openhft.chronicle.hash.serialization.SizedWriter;
-import net.openhft.chronicle.wire.BinaryWire;
-import net.openhft.chronicle.wire.Marshallable;
 import net.openhft.chronicle.wire.Wire;
-import net.openhft.chronicle.wire.Wires;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/impl/MarshallableReaderWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/MarshallableReaderWriter.java
index d633ebab7..eb94ac60f 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/impl/MarshallableReaderWriter.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/MarshallableReaderWriter.java
@@ -1,13 +1,10 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.hash.serialization.impl;
 
 import net.openhft.chronicle.bytes.Bytes;
-import net.openhft.chronicle.hash.serialization.SizedReader;
-import net.openhft.chronicle.hash.serialization.SizedWriter;
-import net.openhft.chronicle.wire.BinaryWire;
 import net.openhft.chronicle.wire.Marshallable;
 import net.openhft.chronicle.wire.Wire;
 import net.openhft.chronicle.wire.Wires;
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/impl/TypedMarshallableReaderWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/TypedMarshallableReaderWriter.java
index e9f375b6c..847b1552e 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/impl/TypedMarshallableReaderWriter.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/TypedMarshallableReaderWriter.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.hash.serialization.impl;
 
 import net.openhft.chronicle.bytes.Bytes;
-import net.openhft.chronicle.hash.serialization.SizedReader;
-import net.openhft.chronicle.hash.serialization.SizedWriter;
-import net.openhft.chronicle.wire.*;
+import net.openhft.chronicle.wire.BinaryWire;
+import net.openhft.chronicle.wire.Marshallable;
+import net.openhft.chronicle.wire.Wire;
+import net.openhft.chronicle.wire.Wires;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/test/java/net/openhft/chronicle/map/perf/MapJLBHTest.java b/src/test/java/net/openhft/chronicle/map/perf/MapJLBHTest.java
index c45b581fa..8f9c269d0 100644
--- a/src/test/java/net/openhft/chronicle/map/perf/MapJLBHTest.java
+++ b/src/test/java/net/openhft/chronicle/map/perf/MapJLBHTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 Chronicle Software
+ * Copyright 2014-2020 chronicle.software
  *
  * http://chronicle.software
  *
diff --git a/src/test/java/net/openhft/chronicle/map/watcher/MapFileClassifier.java b/src/test/java/net/openhft/chronicle/map/watcher/MapFileClassifier.java
index 47be9776c..71604aae7 100644
--- a/src/test/java/net/openhft/chronicle/map/watcher/MapFileClassifier.java
+++ b/src/test/java/net/openhft/chronicle/map/watcher/MapFileClassifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.map.watcher;
diff --git a/src/test/java/net/openhft/chronicle/map/watcher/MapFileManager.java b/src/test/java/net/openhft/chronicle/map/watcher/MapFileManager.java
index f05e9b21e..f267af595 100755
--- a/src/test/java/net/openhft/chronicle/map/watcher/MapFileManager.java
+++ b/src/test/java/net/openhft/chronicle/map/watcher/MapFileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.map.watcher;
diff --git a/src/test/java/net/openhft/chronicle/map/watcher/MapFileManagerMBean.java b/src/test/java/net/openhft/chronicle/map/watcher/MapFileManagerMBean.java
index 806136ef0..da878984a 100755
--- a/src/test/java/net/openhft/chronicle/map/watcher/MapFileManagerMBean.java
+++ b/src/test/java/net/openhft/chronicle/map/watcher/MapFileManagerMBean.java
@@ -1,12 +1,9 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.map.watcher;
 
-import java.lang.reflect.Type;
-import java.util.Set;
-
 @SuppressWarnings("unused")
 public interface MapFileManagerMBean {
 
diff --git a/src/test/java/net/openhft/chronicle/map/watcher/MapWatcherMain.java b/src/test/java/net/openhft/chronicle/map/watcher/MapWatcherMain.java
index 395e6ab1d..745028733 100644
--- a/src/test/java/net/openhft/chronicle/map/watcher/MapWatcherMain.java
+++ b/src/test/java/net/openhft/chronicle/map/watcher/MapWatcherMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Chronicle Software Ltd
+ * Copyright (c) 2016-2020 chronicle.software
  */
 
 package net.openhft.chronicle.map.watcher;