VID-867 Fix the problems
VID-867 Removed unused params
VID-867 Fix the i18n messages as well to elminate unused messages
Merge pull request #1679 from Wikia/VID-867

VID-867 Fix the problems