Revert "Cleanup"

This reverts commit daa8a3113bbdb9ba3f3ada24e6b837fd0e690c64.