CON-2176 | removed unnecessary imports