Cleaned up some TODO comments.