Revert "Revert "Cleanup""

This reverts commit c033a0a6f1d40ec9eb582ec079620b3445a72ad6.