Revert "Cleanup"

This reverts commit b755310d7ddbd4b3bf11b4b674c847819db8d8b2.