Remove unruly query