Clean and build after massive changes in commit c77ab1d7b3