remove graphql query requirement and classes thats overrides graphql query