Clean up some more junk