Move userinfo removal to correct path

[#60313156]
Merge 60313156-move-userinfo-removal to master

[#60313156]