TODO done (removing upgrades that are not repeating)