Bugfix in LightSystem; Cleanup