Cleanup of Build scripts