remove trusts altogether

Change-Id: I91c54121b39cd54a4eebd8b6bec589bd4bfafc1c