Get rid of atom and state, no need.