Clean up stuff that we shouldn't commit.