Remove an out of date comment. Simplify some more.