remove breaking upstream features we don't use