Atom cleanup