Code cleaning/build.sh fixed