Removed dependency to violent-death