remove more unneeded path.join calls