Index: AXtools/AXifPackageCleaner.cls.xml
===================================================================
diff -u -r42458 -r42480
--- AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42458)
+++ AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42480)
@@ -27,7 +27,6 @@
 	do ..UsedClassNames.Clear()
 	
 	do ..GetUsedClassNames(RootPackage_"."_"Envelope")
-	do ..AddUsedClassName(RootPackage_"."_"Envelope")
 	
 	#dim ClassIterator As TECH.Iterator = ##class(TECH.ClassUtils).GetClassesInPackageIterator(RootPackage,$$$True)
 	while ClassIterator.HasNext() {
@@ -37,14 +36,6 @@
 ]]></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>
@@ -53,12 +44,15 @@
 	
 	quit:..UsedClassNames.IsDefined(ClassName)
 	
+	do ..AddUsedClassName(ClassName)
+	
 	set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)
 	set itProperties = ##class(TECH.ListIterator).%New(ClassDefinition.Properties)
 	while itProperties.HasNext() {
 		#dim Property As %Dictionary.PropertyDefinition = itProperties.Next()
 		#dim UsedClassName As %String = Property.Type
 		do ..GetUsedDerivedClasses(UsedClassName)
+		do ..GetUsedSuperClasses(UsedClassName)
 		do ..GetUsedClassNames(UsedClassName)
 		do ..AddUsedClassName(UsedClassName)
 	}
@@ -71,16 +65,26 @@
 <Implementation><![CDATA[
 	quit:$$$Not(##class(TECH.StringUtils).StartsWith(ClassName,..RootPackage))
 	
-	#dim DerivedClasses As %ListOfDataTypes = ##class(TECH.ClassUtils).GetDerivedClasses(ClassName)
-	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(DerivedClasses)
+	#dim Iterator As TECH.Iterator = ##class(TECH.ClassUtils).GetDerivedClassIterator(ClassName)
 	while Iterator.HasNext() {
-		#dim UsedClassName As %String = Iterator.Next()
-		do ..GetUsedClassNames(UsedClassName)
-		do ..AddUsedClassName(UsedClassName)
+		do ..GetUsedClassNames(Iterator.Next())
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="GetUsedSuperClasses">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	quit:$$$Not(##class(TECH.StringUtils).StartsWith(ClassName,..RootPackage))
+	
+	#dim Iterator As TECH.Iterator = ##class(TECH.ClassUtils).GetSuperClassesIterator(ClassName)
+	while Iterator.HasNext() {
+		do ..GetUsedClassNames(Iterator.Next())
+	}
+]]></Implementation>
+</Method>
+
 <Method name="AddUsedClassName">
 <FormalSpec>ClassName:%String</FormalSpec>
 <Private>1</Private>
@@ -90,6 +94,15 @@
 	do ..UsedClassNames.SetAt(ClassName,ClassName)
 ]]></Implementation>
 </Method>
+
+<Method name="DeleteClass">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ##class(TECH.File).Delete(..svnRepo.ExternalName(ClassName_".cls"))
+	do $system.OBJ.Delete(ClassName_".cls")
+]]></Implementation>
+</Method>
 </Class>