VID-1268 remove hardcoded logic