Misc. Cleanups

Reviews: @vinniefalco, @rec
It's like scraping old paint to see this go!