Removing ad labels code
Fixing merge conflicts
Merge pull request #3276 from guardian/removing-ab-ad-label-switch

Removing ad labels code