diff --git a/scripts/build-util.sh b/scripts/build-util.sh
old mode 100644
new mode 100755
diff --git a/scripts/repo-clean.sh b/scripts/repo-clean.sh
old mode 100644
new mode 100755
index 55a803b1..35a11deb
--- a/scripts/repo-clean.sh
+++ b/scripts/repo-clean.sh
@@ -5,17 +5,23 @@ set -e
 # this should be run from chipyard repo top
 RDIR=$(git rev-parse --show-toplevel)
 
-cd $RDIR/libgloss
-rm -rf build.log
-
-cd ../riscv-tools/riscv-isa-sim/
-rm -rf build.log
-
-cd ../riscv-pk
-rm -rf build.log
-
-cd ../riscv-tests
-rm -rf build.log
-
-cd $RDIR/tools/api-config-chipsalliance
-git config --local status.showUntrackedFiles no
+rm -rf $RDIR/toolchains/libgloss/build.log
+rm -rf $RDIR/toolchains/riscv-tools/riscv-isa-sim/build.log
+rm -rf $RDIR/toolchains/riscv-tools/riscv-pk/build.log
+rm -rf $RDIR/toolchains/riscv-tools/riscv-tests/build.log
+rm -rf $RDIR/toolchains/esp-tools/riscv-isa-sim/build.log
+rm -rf $RDIR/toolchains/esp-tools/riscv-pk/build.log
+rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
+(
+    pushd $RDIR/generators/constellation
+    if [ -d espresso ]
+    then
+	git submodule deinit espresso    
+    fi
+    popd
+)
+(
+    pushd $RDIR/tools/api-config-chipsalliance
+    git config --local status.showUntrackedFiles no
+    popd
+)
diff --git a/scripts/utils.sh b/scripts/utils.sh
old mode 100644
new mode 100755