cleanup some code from #111
Merge pull request #122 from Wikia/cleanup

Fix broken master