Fixes, cleanup, removed lightingtest in execution