Clean the previously messy commit

The previous messy commit contains unfinished code.
This commit disables some of the mess.