* PM-15091 remove featureflag.AccessIntelligence * removed unwanted lines of code * fixed merge conflict