Revert "Cleanup"

This reverts commit a83e45064f67fd1a5b3ca7a7c8152fbc591c95aa.