Remove unused imports

JIRA:
CG-78