removed unneeded generics