Cleanup and build