Revert "Cleaning up"

This reverts commit a69eace5680e9224411a7fb22fa7cab2ba9e4138.