Cleaning up
Revert "Cleaning up"

This reverts commit 0ec17125231987314f3ac21bfc5d30878d42012d.