MOB-319: Remove old code
Merge pull request #2519 from Wikia/MOB-319

MOB-319: Remove old code