diff --git a/build.sh b/build.sh
index f732995c67445bacdb635032e06d7f214fc88037..e1251dd05761adc2fc93af0d8ffa660fe9e920e3 100755
--- a/build.sh
+++ b/build.sh
@@ -9,11 +9,9 @@
 # FORTRAN_COMPILER=gfortran
 # Build type (Release/Debug)
 BUILD_TYPE=Debug
-CXX_COMPILER="g++"
+CXX_COMPILER="g++-8"
 
-rm -rf build CMakeCache.txt cmake_install.cmake CMakeFiles;
-#cmake -G "${MAKEFILE_TYPE}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_COMPILER=g++-8 .
+
+$(pwd)/clean.sh
 cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} .
-#make VERBOSE=1 -j ${N_CORES} && echo "Build complete." || exit -1;
 cmake --build . --config ${BUILD_TYPE} -- -j${N_CORES} && (tput setaf 2; echo "Build complete."; tput sgr 0; ) || (tput setaf 1; echo "Build finished with errors!"; tput sgr 0; exit 1;)
-#make install;
diff --git a/clean.sh b/clean.sh
index d2fe6a16d195cfa076bfbde97e92a621105a4d07..3f6c2d69384a9368fd53f590b515d28a074206e5 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
 rm -rf build
+rm -rf Makefile
 rm -rf docs/*
 rm -f src/*TestRunner*
 rm -f src/*.o src/*.mod
 rm -f src/funit.tmp src/*_fun.f90
 rm -f CMakeCache.txt
-rm -f cmake_install.cmake
-rm -rf CMakeFiles
+rm -f cmake_install.cmake src/cmake_install.cmake
+rm -rf CMakeFiles src/CMakeFiles src/examples/CMakeFiles src/tests/CMakeFiles