remove unnecessary generics