diff --git a/scripts/setup b/scripts/setup
index 356a50b3767..654ed61a8b9 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -59,6 +59,8 @@ fi
 
 scripts/create_sed
 
+
+
 #
 # Now turn on DEVELOPER for regression testing
 #
@@ -66,17 +68,15 @@ echo "s%^.*define DEVELOPER 1.*$%#define DEVELOPER 1%g" >tmp/t$$
 sed -f tmp/t$$ build/src/include/version.h >tmp/o$$
 cp tmp/o$$ build/src/include/version.h
 
-#
-# Remove unneeded directories
-#
-rm -rf build/txt build/src/testprogs
-#rm -rf build/.git
+
 sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config
 chmod 755 scripts/regress-config
 cp scripts/regress-config build
 cd build
 rm -f Makefile config.*
 
+
+
 #
 # Run Bareos configuration, make, install
 #
@@ -124,3 +124,22 @@ echo "Running database creation scripts"
 ./make_bareos_tables ${DBTYPE}
 ./grant_bareos_privileges ${DBTYPE}
 cd ${cwd}
+
+
+#
+# Remove unneeded directories
+#
+rm -rf build/txt build/src/testprogs
+rm -rf build/.git
+
+rm build/cscope.out
+rm build/tags
+rm -Rf build/src/ndmp
+
+# remove object files
+find build/ -name '*.o' | xargs rm
+find build/ -name '*.so' | xargs rm
+find build/ -name '*.lo' | xargs rm
+find build/ -name '*.la' | xargs rm
+find build/ -name '.libs' | xargs rm -R
+