VID-1710 simplifying