Path utils cleanup
Changing away from pointers for correct cleanup