Revert "Cleaning up"

This reverts commit f0494816ad0e85d8c47d1574647c5586555eabb2.
Revert "Cleaning up"

This reverts commit bbb0837b030a9daff3afae7de71d95b2d6ad1849.