Moar cleanup.
Coverage