more use atom cleanup