removed container map's parent container -- trying to keep hierarchy as flat as possible.