VID-2089 code cleanup and not sending index as unique id anymore