Housekeeping.

Nothing special; just deleting a couple of unnecessary files and adding
another todo.
Merge pull request #2 from tomalom/dev-master

Housekeeping.