Revert "Cleanup"

This reverts commit 67f77a9ee959f3057e890dd9b17b00f26ffbfbc1.