Revert "Cleaning up"

This reverts commit b1aa712627e8ab59b661e51711625747b1855207.
Revert "Revert "Cleaning up""

This reverts commit 723bfc09ff8b54473025dc9e167550d06e45c84b.