Revert "Revert "Cleanup""

This reverts commit 803d82282459670bb4b6a29315ca5d8e2120e668.
Finish cleanup