Reverting to the correct state, no mask anywhere

Some debug code appeared where not needed