Minor cleanup

Remove some items from the TODO file and remove an unused variable in a test.