(PDB-708) remove unnecessary or amibguous indexes for now

Signed-off-by: Ken Barber <ken@bob.sh>