light ent cleanups