Revert "Revert "Cleanup""

This reverts commit 12865ec9a2e592c7f7c822572d44d41d2ddc2650.