diff --git a/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/MockAlarm.java b/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/MockAlarm.java
deleted file mode 100644
index 969168b..0000000
--- a/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/MockAlarm.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package tddmicroexercises.tirepressuremonitoringsystem;
-
-public class MockAlarm implements IAlarm
-{
-    private boolean alarmOn;
-
-    private int expectedCheckCallsCount = 0;
-    private int actualCheckCallsCount = 0;
-
-    private int expectedAlarmOnCallsCount = 0;
-    private int actualAlarmOnCallsCount = 0;
-
-    public void resetExpectedCallsCount()
-    {
-        expectedCheckCallsCount = 1;
-    }
-
-    public void resetAlarmToOn()
-    {
-        expectedAlarmOnCallsCount = 1;
-        alarmOn = true;    
-    }
-
-    public void verify()
-    {
-        if (expectedAlarmOnCallsCount != actualAlarmOnCallsCount)
-        {
-        	//TODO - find a more appropriate exception
-            throw new IllegalArgumentException("AlarmOn calls count" + actualAlarmOnCallsCount + 
-            		" expected: " + expectedAlarmOnCallsCount);
-        }
-
-        if (expectedCheckCallsCount != actualCheckCallsCount)
-        {
-            throw new IllegalArgumentException("Check calls count" +  actualCheckCallsCount +
-                                                  "expected: " + expectedCheckCallsCount);
-        }
-    }
-
-    public void check()
-    {
-        actualCheckCallsCount += 1;
-    }
-
-    public boolean isAlarmOn()
-    {
-            actualAlarmOnCallsCount += 1;
-            return alarmOn;
-    }
-}
-
diff --git a/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/StubAlarm.java b/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/StubAlarm.java
deleted file mode 100644
index 35c983d..0000000
--- a/TDDMicroExercises/Java/TirePressureMonitoringSystem/src/test/java/tddmicroexercises/tirepressuremonitoringsystem/StubAlarm.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package tddmicroexercises.tirepressuremonitoringsystem;
-
-
-public class StubAlarm implements IAlarm
-{
-    private boolean alarmOnReturnValue;
-
-    public void setAlarmOn(boolean returnValue)
-    {
-        alarmOnReturnValue = returnValue;
-    }
-
-    public void check()
-    {
-        return;
-    }
-
-    public boolean isAlarmOn()
-    {
-        return alarmOnReturnValue;
-    }
-}
-