GROOVY-7053: incorrect direct use of generics type for fields with generics in the type when using @Builder (cleanup unused imports)