removed a lot of the light code for the moment