Disabling some code that seem unstable atm.