Less cleanup
Revert "Less cleanup"

This reverts commit 22eabc77e7043dd7e080cff8320fd91ece79036e.