Update notes for submitted changes

* cleanup trusts in controllers