Remove now-unused generics