clean up unused and inconsistent atomics in arch dirs