The great cleanup pull request