Revert "Container adjustments"
Merge pull request #160 from whoaverse/revert-159-master

Revert "Container adjustments"