relay: readd whois events and cleanup