More unused imports and unnecessary FQCNs