Removed unused imports, warnings resolved