Revert "More cleanup"

This reverts commit fc7f304b4af2500858e85b3e4678d77d6ba6392f.