Using a better cleanup strategy