Cleanup stuff from todo.