Clean out atomic & threading junk from aggregator