Try a new cleanup strategy