Index: Tools/impl/MoveHelper.cls.xml
===================================================================
diff -u -r1018 -r1034
--- Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 1018)
+++ Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 1034)
@@ -27,11 +27,6 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
-<Parameter name="MockClassPrefix">
-<Type>%String</Type>
-<Default>vhTest.Mock</Default>
-</Parameter>
-
 <Method name="%OnNew">
 <FormalSpec>ZoekOpPrefix:%Boolean=0</FormalSpec>
 <Private>1</Private>
@@ -266,15 +261,10 @@
 </Method>
 
 <Method name="CleanUpMocks">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim MockClassIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GetClassesStartingWith(..#MockClassPrefix))
-	while MockClassIterator.HasNext() {
-		#dim MockClassName As %String = MockClassIterator.Next()
-		#dim ClassName As %String = $extract(MockClassName,$length(..#MockClassPrefix)+2,*)
-		if '##class(%Dictionary.ClassDefinition).%ExistsId(ClassName) {
-			do ..svnHelper.SVNDelete(MockClassName_".CLS")
-		}
-	}
+	set MockCleaner = ##class(Tools.Mock.Cleaner).%New()
+	do MockCleaner.CleanUp()
 ]]></Implementation>
 </Method>