#12756 done. LightView removed. Fixed extras