DEVIDM-136: Removed unused imports