more atom cleanup