Revert "Cleanup"

This reverts commit 77f88c0e78d0b255f2d3df6f180fe09477934298.