Cleanup for my fanbase

Hey jerks!  Help me out here!