[new index structure] Remove generics