Revert "House cleaning"

This reverts commit a530033b87f7e5b744365c493689945fcdf77cfe.
Working a little more