Revert "House keeping"

This reverts commit aaf8b33f7deea2ab707773bfe0cb43bc55379059.