updates to remove generics