remove complex query parsing