Removed all traces of old QueryOrRaw wrapper class