Revert "Container adjustments"

Reverts whoaverse/whoaverse#159