resurrect diff
More cleanup
initial selection, cleanup
cleanup