cleanup the gameserver query action duplication