Remove unused Query class