Cleanup queries. See: websharks/s2member#116