Refactor trustpaths