revising cleanup strategy