Cleanup (Don't merge)

Untested.