Revert "Cleaning"

This reverts commit 67061eb865994810d93758fcdfca989ab8d7c5a3.
Test