Cleanup diff stuff