Cleanup and build 16.