Disabling some features for removal