Remove more A/B test code