diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/impl/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/SerializationBuilder.java
index f379c507c..f6a1952be 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/impl/SerializationBuilder.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/SerializationBuilder.java
@@ -191,7 +191,6 @@ public final class SerializationBuilder<T> implements Cloneable {
     }
 
     public long constantSizeBySample(T sampleObject) {
-        // TODO mark.price this should probably be maxSize()
         long constantSize = serializationSize(sampleObject);
         if (constantSizeMarshaller() && !DynamicallySized.class.isAssignableFrom(sampleObject.getClass())) {
             long expectedConstantSize = constantSize();
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index e476b19e2..c4de34d46 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -1826,11 +1826,6 @@ public final class ChronicleMapBuilder<K, V> implements
                 keyBuilder, averageKeySize, averageKey, sampleKey, "Key");
         averageValueSize = preMapConstruction(
                 valueBuilder, averageValueSize, averageValue, sampleValue, "Value");
-
-        // TODO mark.price
-//        System.out.printf(Thread.currentThread().getName() + "|++!! averageValueSize calculated as %.2f%n",
-//                averageValueSize);
-
         stateChecks();
     }
 
diff --git a/src/test/java/net/openhft/chronicle/map/BasicReplicationTest.java b/src/test/java/net/openhft/chronicle/map/BasicReplicationTest.java
index 7e5b4b2c5..51eb2f816 100644
--- a/src/test/java/net/openhft/chronicle/map/BasicReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/BasicReplicationTest.java
@@ -59,7 +59,7 @@ public class BasicReplicationTest {
             final Map[] maps = new Map[] {mapOne, mapTwo, mapThree};
 
             final Random random = new Random(0xBAD5EED);
-            for (int i = 0; i < 50; i++) {
+            for (int i = 0; i < 5; i++) {
                 final int mapIndex = random.nextInt(maps.length);
                 final Map map = maps[mapIndex];
                 final String key = "key" + random.nextInt(100);
@@ -68,7 +68,7 @@ public class BasicReplicationTest {
                 System.out.printf("map %d, put(%s, %s)%n", mapIndex, key, value);
             }
 
-            LockSupport.parkNanos(TimeUnit.DAYS.toNanos(5L));
+            LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(5L));
             executorService.shutdownNow();
 
             for(String key : mapOne.keySet()) {