Removed (most) atom usage