diff --git a/releng.control/cleanupArtifacts.sh b/releng.control/cleanupArtifacts.sh
index e1044d9..0981230 100644
--- a/releng.control/cleanupArtifacts.sh
+++ b/releng.control/cleanupArtifacts.sh
@@ -4,7 +4,7 @@
 # remember to leave no slashes on filename in source command,
 # (the commonVariations.shsource file, that is)
 # so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED ]
+if [ -z $BUILD_INITIALIZED ]
 then
    source commonVariations.shsource
    source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
@@ -20,19 +20,19 @@
 # existence of more recent builds into account, so we never
 # delete the last existing build (even if "old").
 
-ndays=5;
+ndays=4;
 artifactsDir=${PROJECT_ARTIFACTS};
 
 echo;
-echo "    Removing artifact directories older than ${n} days";
+echo "    Removing artifact directories older than ${ndays} days";
 echo "        (from ${artifactsDir})";
 before=`find ${artifactsDir} -mindepth 2 -maxdepth 2 | wc -l`;
 echo "            number of directories before cleaning: ${before}";
 
-# empty directories often result from "bad builds"
+# empty directories often result from "bad builds". We remove those no matter how old
 find ${artifactsDir} -mindepth 2 -maxdepth 3 -type d -empty -exec rm -fr '{}' \;
 # now remove old ones
-find ${artifactsDir} -mindepth 2 -maxdepth 2 -ctime +$ndays -exec ./removeIf '{}' \;
+find ${artifactsDir} -mindepth 2 -maxdepth 2 -ctime +$ndays -execdir ${BUILD_HOME}/releng.control/removeIf.sh '{}' \;
 
 after=`find ${artifactsDir} -mindepth 2 -maxdepth 2 | wc -l`;
 echo "            number of directories after cleaning: ${after}";
diff --git a/releng.control/getCustomPagesFromCVS.sh b/releng.control/get-customPages.sh
similarity index 100%
rename from releng.control/getCustomPagesFromCVS.sh
rename to releng.control/get-customPages.sh
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/get-relengControl.sh
similarity index 100%
rename from releng.control/getFromCVS-relengControl.sh
rename to releng.control/get-relengControl.sh
diff --git a/releng.control/removeIf.sh b/releng.control/removeIf.sh
index 8f64523..6d88cf0 100644
--- a/releng.control/removeIf.sh
+++ b/releng.control/removeIf.sh
@@ -1,19 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ -n $1 ] 
-  then 
+# echo "arg: $1";
+
+if [ -z $1 ]
+  then
     echo "  This script requires an argument. " ;
     exit 1;
   fi
 
-$foundDirectory = $1;
-
+foundDirectory=$1
+# should already be in foundDirectory, if execDir used
 cd $foundDirectory
-
+// move up one so we can examine syblings
 cd ..
+currentDirectory=`pwd`
+echo $currentDirectory
+ndirs=`ls -lA | wc -l`
+ndirs=$ndirs - 1; # don't count the "totals" line
+# echo "NDirs: $ndirs"
 
-ndirs = `ls -l | wc -l`
-    
-echo "NDirs: $ndirs";
+# if only one left, do not remove it, no matter how old
+if [ $ndirs = 1 ]
+then
+    exit 0;
+fi
+# ok, it is old, and not the only one left
+rm -fr $foundDirectory
 
-    
\ No newline at end of file
+
+