Remove switches and remaining logic
Remove more logic
Remove redundant contextHtml
Fix merge conflict
Merge pull request #2777 from guardian/remove-swipe

Remove swipe switches