Clean up repo for the merge