CLC-2626 Remove redundant feature flag checks