Revert "Cleaning v2"

This reverts commit 4308853746ba81a21099657757bad21229188181.