Get rid of all these TODO comments.