cleaning up some container stuff