diff --git a/scripts/Cleanup b/scripts/Cleanup
index ef1e5266e..c75721bc8 100755
--- a/scripts/Cleanup
+++ b/scripts/Cleanup
@@ -45,7 +45,7 @@ done
 # Remove src*
 #
 for x in src src.* build/*/ROCK/src.*; do
-    if [ -d "$x" ] ; then
+    if [ -d "$x" -o -L "$x" ] ; then
 	if [ "$#" != 0 ] ; then
 		delme=0
 		for y ; do [ "${y%/}" = "$x" ] && delme=1 ; done
@@ -62,19 +62,6 @@ for x in src src.* build/*/ROCK/src.*; do
 		fi
 	done
 
-	## Backward compat. Remove that loop later
-	for y in proc R.orig/download R.orig R.build R.src/mnt* mnt* ; do
-		if [ $delme = 1 -a -d "$x/$y" ] ; then
-			umount -d -f    "$x/$y" > /dev/null 2>&1
-			umount -d -f -l "$x/$y" > /dev/null 2>&1
-			rmdir  "$x/$y" > /dev/null 2>&1
-			if [ -d "$x/$y" ] ; then
-				echo "Found $y in $x: Not removing!"
-				delme=0
-			fi
-		fi
-	done
-
 	if [ $delme = 1 ] ; then
 		echo "removing $x .."
 		rm -rf "$x"