* Remove feature flag checks * Update unit test * Remove yaml file * Remove doc reference to feature flag Changelog: changed