Improve index entry. Remove redundant ones.