@pp-mo Legacy comment? Remove?