DEVIDM-127 - Removed unused imports