Part 2/3 of a very silly cleanup