Removed support for a couple of features that are no longer needed.