Minor comment changes - removed some now irrelevant TODOs.