Revert "Some cleaning"

This reverts commit f1b485a9988ac0d61ce01d48160ec6ecfeaaa15c.