Clean up the diff settings