Added diff & cleanup.