Revert "Cleanup"

This reverts commit e3d9a5e6fafa12addc655623f08b01cfef928bd3.