Cleaned up build scripts