Aaaaaand more cleanup.