Wire light and lamp cleanup

Wire light and lamp cleanup