Fix upgrade constants after removing AAF upgrade

Also, remove AAF upgrades on both sides, since the offsets apply to both sides,
so they cannot have different upgrade trees.