Even more path-related cleanup