Clean up some of my old crap