Clean up a lot of container heirarchy stuff