Tweak comments to remove TODOs