Remove a few conflicting features

With Hyrbid settings merged in, certain features are better controlled through here now

Credit @Bajee11 for most of this