Revert "More cleanup"

This reverts commit 76867a4cded12291fc2d2210816eb34f2cc04e5b.