Query() moar cleanup