This removes some unused and unsupported features, and leaves in support for another currently unused feature that might be used in the future.