Delete a bit of dead code and some obsolete TODOs.