Cleanup and first build test