light cleanup (more to come)