More path cleanup