Remove query parser integration