Remove unnecessary atomic to simplify build