Another light cleanup round