Cleanup and relying on parameterized build