Improve index entry. Remove redundant one.