diff --git a/bootstrap_fn b/bootstrap_fn
index fe1fe51..d43dc64 100644
--- a/bootstrap_fn
+++ b/bootstrap_fn
@@ -301,9 +301,7 @@ install_prereqs () {
 ######################################################################
 
 cleanup () {
-    for d in run; do
-        (cd $d; ./cleanup)
-    done
+    (cd run/ocamlrun-3.09.3 && ./cleanup)
     rm -f godi.conf godi_confdir digest/.size
 }
 
diff --git a/run/ocamlrun-3.09.3/cleanup b/run/ocamlrun-3.09.3/cleanup
index 6252455..61079e6 100755
--- a/run/ocamlrun-3.09.3/cleanup
+++ b/run/ocamlrun-3.09.3/cleanup
@@ -1,15 +1,19 @@
 #! /bin/sh
 
-( cd byterun;
-  rm -f *.o lib*.a primitives prims.c opnames.h jumptbl.h ld.conf
-  rm -f ocamlfatrun*
-)
-( cd config;
-  rm -f Makefile s.h m.h
-)
-( cd otherlibs/str
-  rm -f *.o *.a
-)
-( cd otherlibs/unix
-  rm -f *.o *.a
-)
+if [ -d byterun ]; then
+  cd byterun && 
+  rm -f *.o lib*.a primitives prims.c opnames.h jumptbl.h ld.conf &&
+    rm -f ocamlfatrun*
+fi
+
+if [ -d config ]; then
+  cd config && rm -f Makefile s.h m.h
+fi
+
+if [ -d otherlibs/str ]; then
+  cd otherlibs/str && rm -f *.o *.a
+fi
+
+if [ -d otherlibs/unix ]; then
+  cd otherlibs/unix rm -f *.o *.a
+fi