Revert "House Cleaning 2"

This reverts commit 6bee84e8e6339914701bcd78ad47f4149fdcd061.