Updates to remove upgrade