Remove cherry pick, cleanup and annotate work