CLSN-1595 : remove iunique key dependency