Removed common/atomic, instead using std::atomic