VE-1489: Cleanup from sprint 25

https://wikia-inc.atlassian.net/browse/VE-1489