Revert "Add new classes for TrustedQuery"

This reverts commit 5f190791e98533c0d841ff51578f98aa7479781c.