Made some decisions about stuff..

I know this comes as a surprise, but I actually made a decision and deleted something.

Turns out its not so hard.
Merge pull request #2936 from guardian/the-switch

Made some decisions about stuff..