Remove the concept of a mode in the upgrader