Index: AXtools/AXifPackageCleaner.cls.xml
===================================================================
diff -u -r42457 -r42458
--- AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42457)
+++ AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42458)
@@ -13,10 +13,15 @@
 <Private>1</Private>
 </Property>
 
+<Property name="svnRepo">
+<Type>svn.Repository.CodeRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Cleanup">
 <FormalSpec>RootPackage:%String</FormalSpec>
 <Implementation><![CDATA[
-	set svnHelper = ##class(svn.Helper).%New()
+	set ..svnRepo = ##class(svn.Repository.CodeRepository).%OpenId(1)
 
 	set ..RootPackage = RootPackage
 	do ..UsedClassNames.Clear()
@@ -27,11 +32,19 @@
 	#dim ClassIterator As TECH.Iterator = ##class(TECH.ClassUtils).GetClassesInPackageIterator(RootPackage,$$$True)
 	while ClassIterator.HasNext() {
 		#dim ClassName As %String = ClassIterator.Next()
-		do:$$$Not(..UsedClassNames.IsDefined(ClassName)) svnHelper.SVNDelete(ClassName_".cls")
+		do:$$$Not(..UsedClassNames.IsDefined(ClassName)) ..DeleteClass(ClassName)
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="DeleteClass">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##class(TECH.File).Delete(..svnRepo.ExternalName(ClassName_".cls"))
+	do $system.OBJ.Delete(ClassName_".cls")
+]]></Implementation>
+</Method>
+
 <Method name="GetUsedClassNames">
 <FormalSpec>ClassName:%String</FormalSpec>
 <Private>1</Private>
@@ -62,8 +75,8 @@
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(DerivedClasses)
 	while Iterator.HasNext() {
 		#dim UsedClassName As %String = Iterator.Next()
-		do ..GetUsedClassNames(ClassName)
-		do ..AddUsedClassName(ClassName)
+		do ..GetUsedClassNames(UsedClassName)
+		do ..AddUsedClassName(UsedClassName)
 	}
 ]]></Implementation>
 </Method>