Revert "More cleaning"

This reverts commit edffc04ed0150c90a115afed1a6cd6f5081d79ea.