Revert "Cleanup"

This reverts commit 1de770cce0d44dcc5f2d7fc5218302b56f30daa9.
Revert "Revert "Cleanup""

This reverts commit 9440b2e7796c646cbf746b63a2406b2415154b90.