Merge pull request #23575 from pzygielo/containers

Remove unused fields and dead code