Remove todos.  This can't be done without #199.