More path-related cleanup