more cleanup of paths that were using str concat everywhere