Remove defaults from upgrade and upgrade-keys-links