Revert "add BO for QuerySubscriber"

This reverts commit 19d309dcb573b3998a83d8d2eae326c3940c64c6.