New paths and comment cleanup