Removed old query grammar