Request

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