Update 1.1 light cleanup

Light cleanup