VID-1875 cleaning up implementation