Add first draft of whois server dataset. And cleanup.