Remove wrong indexBy generics