SSP-1881 code cleanup, add unique index