cleanup wnv-specific stuff for a PR