Clean up some unnecessary Pathname usage