Cleanup
Revert "Cleanup"

This reverts commit 6c0421f0f91bdfa2e12495da5d7d03576cd51d95.
Better Cleanup