fixing redundant generics