Some cleanup + build scripts