Remove unneeded indexName and typeName fields