Clean-up: move a misplaced TODO to the right place, and delete a temp file created by a test.