Housekeeping.

Nothing special; just deleting a couple of unnecessary files and adding
another todo.