Remove duplicated code in orgs repo [#65037890]