diff cleanups