Some Clean-ups in the zac.lumiere due to new way of