Cleanup and adding risk battle resolver.