Revert "Cleanup"

This reverts commit 2a1e8591c13c42bbf0b4301c91f782a4e2321875.
Revert "Revert "Cleanup""

This reverts commit 0d04d9cbc41c2e047e749eb6f76917b62b2a0304.