Revert "Add getQuery and getTokens method in the interface"

This reverts commit 2ddccafdcc816dc3918865b2f0dc7608b122211b.