Cleaning up
Revert "Cleaning up"

This reverts commit 0f101b407b32c6d9fd2d5d37f2248f9c4629196b.
Revert "Revert "Cleaning up""

This reverts commit aeef8d18d22780bb5a4124cdc7d241858ee491ef.