Clean up the way to build