More cleanup. Atom goes to Brujo