remove redunant indices from PK columns

Change-Id: I4b0767a3fc863fa70039ca56fccda45f21a3fa4a