Yes I think this needs to be removed because logically, the addSystemInfo method here follows the removeOrgInfo which removed the keyname parameter.