Revert "Cleanup"

This reverts commit ea5edc1b13f724bcf728594d5052624a0054e57d.