Further guttage of trust stuff