Wildlife Warfare: Re-vert to latest version, clean up

see above*