Fix vol op scenarios that were nullified by feature flag
Delete unused step definition for multiple feature flags