Clean up query package.