Revert "Revert "Cleanup""

This reverts commit 6b135515aa53ccce8a9d4b915a3d82d30cc30a75.