Request

Pulled out the relevant commits, and the `_cleanup_ stuff_` is gone from here.