More cleanup.

Moar cleanup.