Removed unused imports, including ServiceLocator