Tidy switches, remove underused implicits
Merge pull request #7395 from guardian/cricket-scores-switch

Tidy switches, remove underused implicits