Fixed EZP-19161: Remove redundant indexes/keys