Disabling added code until it can be properly debugged. Didn't break anything else it seems