Cleanup and new build