Remove Enable/Disable system