Merge "Removing Named Query."