remove already deprecated internal functionality
Merge pull request #3539 from stefanpenner/remove_deprecated_container_stuff

remove already deprecated internal functionality