Light clean up

See text