LUN-600 -- removed unused imports