Revert "some cleaning"

This reverts commit 28218cbf081571c7098c7f3b1d4a035a3fefa818.