Removed unused imports and unnecessary FQCN