Cleanup

Wow, I make too many cleanup commits... but, you can never have too many
cleanups :3