Remove "XXX TODO" that is probably not going to get done.