Remove old clickstream
Fix merge conflict
Merge pull request #1959 from guardian/remove-old-clickstream

Remove old clickstream