Revert "Cleaning"

This reverts commit 8130576f52f728a14512b315e2fa88ed3f96a12f.