merge-recursive: remove stale commented debugging code