Remove indexBy