Clean unused imports, fix generic type arguments