Removed old comments (Flavien's PR merge OK)