Remove all references to atom