Get rid of some dead code and unneeded XXX comments by Neal.
2 files changed