Revert "Some cleaning"

This reverts commit c43e288a6accd7e516df42bda6b762152dfd5e7c.