Remove a parameter from Util.query
Utility Refactoring - again