Revert "More cleaning"

This reverts commit 20da6842fb9b887d1e67bb802ba377334bc8db42.