removing features from patched and updating and placing into contrib