removes offending code
Merge branch 'twitter-hotfix' into develop
Merge branch 'develop'