Run a cleanup script over our code base without causing extra merge conflicts for others