Cleanup for build 2