diff --git a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
index 4621d93..e108ab9 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+++ b/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
@@ -33,10 +33,6 @@
 
     public <T> T createMock(Class<T> typeToMock, Class<?>[] extraInterfaces,
             MockitoInvocationHandler handler, MockSettingsInfo settings) {
-        // TODO
-        System.setProperty("dexmaker.dexcache", "/data/vogar"); // TODO
-        // TODO
-        
         InvocationHandler invocationHandler = new InvocationHandlerAdapter(handler);
 
         if (typeToMock.isInterface()) {
diff --git a/src/mockito/resources/META-INF/services/org.mockito.plugins.MockMaker b/src/mockito/resources/services/org.mockito.plugins.MockMaker
similarity index 100%
rename from src/mockito/resources/META-INF/services/org.mockito.plugins.MockMaker
rename to src/mockito/resources/services/org.mockito.plugins.MockMaker