More cleanup
Last cleanup, I think. Really.