more filepath cleanup