Removed the enabled disable code