Cleanup on branch editor (2)