Removed Discussion switches (except needed ones)
Merge pull request #2797 from guardian/discussion-switch-tidy

Removed Discussion switches (except needed ones)