Merge "Remove unused local variables -- path" into main