Revert "Cleaning House"

This reverts commit 09919f3d37557cf46f4391f6b2bff15474efdd79.