removed unnecessary generics