Remove all references to risk