Cleanup pathnames again