reduce redundant feature gate overrides

Signed-off-by: shwetha-s-poojary <shwetha.s-poojary@ibm.com>