Remove redundant code from FeatureContext