IDEUI-390 clean up

Task-Url: https://jira.codenvycorp.com/browse/IDEUI-390