Comment cruft removed