remove comment junk; decouple query from query client