Remove pointless use of std::atomic