General source cleanup (no actual changes)
Fix build script for real