Revert "cleanup"

This reverts commit 17e315e2b043b7ec9a9a5d0f60a98c29fc3cb93f.
cleanup, for real this time