Merge pull request #12988 from Mashimiao/remove-unused-container-functions

cleanup: remove unneeded locks