More elimination of obviously redundant keys

upkeep=full is default, free isn't needed to canrecruit=yes, ids never
referred to (and in one case is duplicated and so incorrect)