Revert "Cleaning part2."

This reverts commit 9339a44e33ce6f79bc32ab43c8821c9b1bdacf40.