Disable unused features for now