Revert "More Cleaning"

This reverts commit cb4a28311cd2b2df2e422ceabd3353b49eb07d3f.