Fix Makefile and remove old build script