more cleanups for namespace move (containers private datastructures)