Remove canned queries.
Merge pull request #1004 from afred/remove-old-canned-queries

Remove canned queries.