Revert "Cleanup"

This reverts commit 084f2f767ee5adea989bf984178183a41b5d9b3e.