Diff cleanup