Removed unused imports
Minor changes