Diff minimization/clean-up