Index: TECH/Files.cls.xml
===================================================================
diff -u -r9 -r224
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 9)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 224)
@@ -176,6 +176,40 @@
 	If $$$ERROR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.FileException).%New("Kon bestand niet kopieren van "_FromPath_" naar "_ToPath,Status))
 ]]></Implementation>
 </Method>
+
+<Method name="RemoveDirectoryTreeOlderThen">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Path:%String,Tijdstip:%TimeStamp</FormalSpec>
+<Implementation><![CDATA[
+	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
+	Do ResultSet.Execute(Path,"*")
+	While(ResultSet.Next()) {
+		#dim FileType As %String = ResultSet.Data("Type")
+		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.Data("DateModified"))
+		If (FileType = "D") && (Tijdstip ]] DateModified){
+			#dim FileLocation As %String = ResultSet.Data("Name")
+			Do ##class(%File).RemoveDirectoryTree(FileLocation)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="RemoveFilesOlderThen">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Path:%String,Tijdstip:%TimeStamp</FormalSpec>
+<Implementation><![CDATA[
+	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
+	Do ResultSet.Execute(Path,"*")
+	While(ResultSet.Next()) {
+		#dim FileType As %String = ResultSet.Data("Type")
+		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.Data("DateModified"))
+		If (FileType = "F") && (Tijdstip ]] DateModified){
+			#dim FileLocation As %String = ResultSet.Data("Name")		
+			Do ##class(TECH.File).Delete(FileLocation)
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: TECH/File.cls.xml
===================================================================
diff -u -r9 -r224
--- TECH/File.cls.xml	(.../File.cls.xml)	(revision 9)
+++ TECH/File.cls.xml	(.../File.cls.xml)	(revision 224)
@@ -28,34 +28,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RemoveDirectoryTree">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Directory:%String</FormalSpec>
-<ReturnType>%Library.Integer</ReturnType>
-<Implementation><![CDATA[
-	#if $system.Version.GetMajor()=5
-	
-	// Uitlezen van alle bestanden in de directory
-	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
-	Do ResultSet.Execute(Directory,"*")
-	While(ResultSet.Next()) {
-		Set FileLocation = ResultSet.Data("Name")
-		If (..DirectoryExists(FileLocation)) {
-			Do ..Delete(FileLocation)
-		} Else	{
-			Do ..Delete(FileLocation)
-		}
-	}
-	Quit ..RemoveDirectory(Directory)
-	
-	#else
-	
-	quit ##super(Directory)
-	
-	#endif
-]]></Implementation>
-</Method>
-
 <Method name="GetTempDir">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>