Clean-up of now unneeded path munging logic