Index: TECH/Files.cls.xml
===================================================================
diff -u -r1908 -r1911
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 1908)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 1911)
@@ -37,28 +37,17 @@
 	else  set Delim = "\"
 	If $extract(Directory,$length(Directory))'=Delim set Directory = Directory_Delim
 	If $extract(Filename)=Delim Set Filename = $extract(Filename,2,$length(Filename))
-	#dim resFilename As %String = ..RemoveIllegalCharacters(Directory_Filename)
+	#dim resFilename As %String = Directory _ ..RemoveIllegalCharacters(Filename)
 	Quit resFilename
 ]]></Implementation>
 </Method>
 
 <Method name="RemoveIllegalCharacters">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>FileOrDirectory:%String</FormalSpec>
+<FormalSpec>Filename:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Result As %String = ""
-	if $$$StartsWith(FileOrDirectory,"\\") {
-		set Result = $translate(FileOrDirectory,":<>|*?""","")
-	} elseif $$$StartsWith($$$LCase(FileOrDirectory),"http") {
-		set Result = FileOrDirectory
-	} else  {
-		#dim FirstPart As TECH.String = $piece(FileOrDirectory,":",1)
-		#dim SecondPart As TECH.String = $piece(FileOrDirectory,":",2,$length(FileOrDirectory,":"))
-		set Result = FirstPart_":"_$translate(SecondPart,":<>|*?""","")		
-	}
-	quit Result
+<Implementation><![CDATA[	quit $translate(Filename,":<>|*?""","")
 ]]></Implementation>
 </Method>