do a better cleanup job