fixed ticket 2397
moved to different branch
removed unneeded import
Merge pull request #280 from igal-getrailo/jira-2397

fixed ticket 2397