Revert "Cleanup"

This reverts commit 6e7c3ac930701cd9f78231c98cbddde265a05cd9.