Removed unused imports to pass CheckStyle