Moved to PK as primary key, in partial refactoring to move to single index