Reduce differences from master

e.g. remove the Reanalyze button.