Cleanup `container` package
WIP