VID-1240 Eliminate other unecessary left join