deprecation fixes

Add back update/upgrade

simplify package installs

(0) -30 -10 -3 +3 tip

mercurial