diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index 0892df9..6cb95c4 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -236,7 +236,7 @@
     if (message != nullptr)
     {
         msg = message->message;
-        severity = message->severity;
+        severity = message->messageSeverity;
     }
 
     redfish::registries::fillMessageArgs(messageArgs, msg);
diff --git a/redfish-core/include/registries.hpp b/redfish-core/include/registries.hpp
index eff91a4..26e1941 100644
--- a/redfish-core/include/registries.hpp
+++ b/redfish-core/include/registries.hpp
@@ -38,7 +38,6 @@
 {
     const char* description;
     const char* message;
-    const char* severity;
     const char* messageSeverity;
     const size_t numberOfArgs;
     std::array<const char*, 5> paramTypes;
diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp
index ef7ba62..48875ec 100644
--- a/redfish-core/include/registries/base_message_registry.hpp
+++ b/redfish-core/include/registries/base_message_registry.hpp
@@ -37,7 +37,6 @@
             "Indicates that while attempting to access, connect to, or transfer to or from another resource, the service denied access.",
             "While attempting to establish a connection to '%1', the service denied access.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -50,7 +49,6 @@
             "Indicates that the account for the session has been removed, thus the session has been removed as well.",
             "The account for the current session has been removed, thus the current session has been removed as well.",
             "OK",
-            "OK",
             0,
             {},
             "Attempt to connect with a valid account.",
@@ -61,7 +59,6 @@
             "Indicates that the account was successfully modified.",
             "The account was successfully modified.",
             "OK",
-            "OK",
             0,
             {},
             "No resolution is required.",
@@ -72,7 +69,6 @@
             "Indicates that the modification requested for the account was not successful.",
             "The account modification request failed.",
             "Warning",
-            "Warning",
             0,
             {},
             "The modification may have failed due to permission issues or issues with the request body.",
@@ -83,7 +79,6 @@
             "Indicates that the account was successfully removed.",
             "The account was successfully removed.",
             "OK",
-            "OK",
             0,
             {},
             "No resolution is required.",
@@ -94,7 +89,6 @@
             "Indicates the action is deprecated.",
             "The action %1 is deprecated.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -107,7 +101,6 @@
             "Indicates that the action supplied with the POST operation is not supported by the resource.",
             "The action %1 is not supported by the resource.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -120,7 +113,6 @@
             "Indicates that the action was supplied with a duplicated parameter in the request body.",
             "The action %1 was submitted with more than one value for the parameter %2.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -134,7 +126,6 @@
             "Indicates that the action requested was missing a parameter that is required to process the action.",
             "The action %1 requires the parameter %2 to be present in the request body.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -148,7 +139,6 @@
             "Indicates that the parameter supplied for the action is not supported on the resource.",
             "The parameter %1 for the action %2 is not supported on the target resource.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -162,7 +152,6 @@
             "Indicates that an action was submitted but a parameter supplied did not match any of the known parameters.",
             "The action %1 was submitted with the invalid parameter %2.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -176,7 +165,6 @@
             "Indicates that a parameter was given an invalid value.",
             "The value for the parameter %1 in the action %2 is invalid.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -190,7 +178,6 @@
             "Indicates that a parameter was given the correct value type but the value of that parameter was not supported.  This includes the value size or length has been exceeded.",
             "The value '%1' for the parameter %2 in the action %3 is of a different format than the parameter can accept.",
             "Warning",
-            "Warning",
             3,
             {
                 "string",
@@ -205,7 +192,6 @@
             "Indicates that a parameter was given the correct value type but the value of that parameter was not supported.  The value is not in an enumeration.",
             "The value '%1' for the parameter %2 in the action %3 is not in the list of acceptable values.",
             "Warning",
-            "Warning",
             3,
             {
                 "string",
@@ -220,7 +206,6 @@
             "Indicates that a parameter was given the wrong value type, such as when a number is supplied for a parameter that requires a string.",
             "The value '%1' for the parameter %2 in the action %3 is of a different type than the parameter can accept.",
             "Warning",
-            "Warning",
             3,
             {
                 "string",
@@ -235,7 +220,6 @@
             "Indicates that the request requires a specified chassis to be powered off.",
             "The Chassis with Id '%1' requires to be powered off to perform this request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -248,7 +232,6 @@
             "Indicates that the request requires a specified chassis to be powered on.",
             "The chassis with Id '%1' requires to be powered on to perform this request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -261,7 +244,6 @@
             "Indicates that one or more fault or error conditions exist in a related resource.",
             "One or more conditions exist in a related resource.  See the OriginOfCondition property.",
             "Warning",
-            "Warning",
             0,
             {},
             "Check the Conditions array in the resource shown in the OriginOfCondition property to determine the conditions that need attention.",
@@ -272,7 +254,6 @@
             "Indicates that the attempt to access the resource, file, or image at the URI was unsuccessful because a session could not be established.",
             "The service failed to establish a connection with the URI '%1'.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -285,7 +266,6 @@
             "Indicates that a create was attempted on a resource but that properties that are required for the create operation were missing from the request.",
             "The create operation failed because the required property %1 was missing from the request.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -298,7 +278,6 @@
             "Indicates that no more resources can be created on the resource as it has reached its create limit.",
             "The create operation failed because the resource has reached the limit of possible resources.",
             "Critical",
-            "Critical",
             0,
             {},
             "Either delete resources and resubmit the request if the operation failed or do not resubmit the request.",
@@ -309,7 +288,6 @@
             "Indicates that all conditions of a successful create operation have been met.",
             "The resource has been created successfully.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -320,7 +298,6 @@
             "Indicates that the request body contained an empty JSON object when one or more properties are expected in the body.",
             "The request body submitted contained an empty JSON object and the service is unable to process it.",
             "Warning",
-            "Warning",
             0,
             {},
             "Add properties in the JSON object and resubmit the request.",
@@ -331,7 +308,6 @@
             "Indicates that a event subscription establishment has been requested but the operation failed due to the number of simultaneous connection exceeding the limit of the implementation.",
             "The event subscription failed due to the number of simultaneous subscriptions exceeding the limit of the implementation.",
             "Critical",
-            "Critical",
             0,
             {},
             "Reduce the number of other subscriptions before trying to establish the event subscription or increase the limit of simultaneous subscriptions, if supported.",
@@ -342,7 +318,6 @@
             "Indicates that a general error has occurred.  Use in `@Message.ExtendedInfo` is discouraged.  When used in `@Message.ExtendedInfo`, implementations are expected to include a `Resolution` property with this message and provide a service-defined resolution to indicate how to resolve the error.",
             "A general error has occurred.  See Resolution for information on how to resolve the error, or @Message.ExtendedInfo if Resolution is not provided.",
             "Critical",
-            "Critical",
             0,
             {},
             "None.",
@@ -353,7 +328,6 @@
             "Indicates that the credentials associated with the established session do not have sufficient privileges for the requested operation.",
             "There are insufficient privileges for the account or credentials associated with the current session to perform the requested operation.",
             "Critical",
-            "Critical",
             0,
             {},
             "Either abandon the operation or change the associated access rights and resubmit the request if the operation failed.",
@@ -364,7 +338,6 @@
             "Indicates that the request failed for an unknown internal error but that the service is still operational.",
             "The request failed due to an internal service error.  The service is still operational.",
             "Critical",
-            "Critical",
             0,
             {},
             "Resubmit the request.  If the problem persists, consider resetting the service.",
@@ -375,7 +348,6 @@
             "The index is not valid.",
             "The index %1 is not a valid offset into the array.",
             "Warning",
-            "Warning",
             1,
             {
                 "number",
@@ -388,7 +360,6 @@
             "Indicates that the request body contains invalid JSON.",
             "The request body submitted is invalid JSON starting at line $1 and could not be parsed by the receiving service.",
             "Critical",
-            "Critical",
             1,
             {
                 "number",
@@ -401,7 +372,6 @@
             "Indicates that the object in question is invalid according to the implementation.  Examples include a firmware update malformed URI.",
             "The object at '%1' is invalid.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -414,7 +384,6 @@
             "Indicates that the operation encountered a URI that does not correspond to a valid resource.",
             "The URI %1 was not found.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -427,7 +396,6 @@
             "Indicates that the request body was malformed JSON.",
             "The request body submitted was malformed JSON and could not be parsed by the receiving service.",
             "Critical",
-            "Critical",
             0,
             {},
             "Ensure that the request body is valid JSON and resubmit the request.",
@@ -438,7 +406,6 @@
             "Indicates that sufficient errors have occurred that the reporting service cannot return them all.",
             "Too many errors have occurred to report them all.",
             "Critical",
-            "Critical",
             0,
             {},
             "Resolve other reported errors and retry the current operation.",
@@ -449,7 +416,6 @@
             "Indicates that network-based name resolution has not been configured on the service.",
             "Network name resolution has not been configured on this service.",
             "Warning",
-            "Warning",
             0,
             {},
             "Configure the network name resolution protocol support on this service, or update any URI values to include an IP address instead of a network name and resubmit the request.",
@@ -460,7 +426,6 @@
             "Indicates the service does not support network-based name resolution.",
             "Resolution of network-based names is not supported by this service.",
             "Warning",
-            "Warning",
             0,
             {},
             "Update any URI values to include an IP address instead of a network name and resubmit the request.",
@@ -471,7 +436,6 @@
             "Indicates that the requested operation will not perform any changes on the service.",
             "The request body submitted contain no data to act upon and no changes to the resource took place.",
             "Warning",
-            "Warning",
             0,
             {},
             "Add properties in the JSON object and resubmit the request.",
@@ -482,7 +446,6 @@
             "Indicates that the operation failed because a valid session is required in order to access any resources.",
             "There is no valid session established with the implementation.",
             "Critical",
-            "Critical",
             0,
             {},
             "Establish a session before attempting any operations.",
@@ -493,7 +456,6 @@
             "Indicates that one of the internal operations necessary to complete the request failed.  Examples of this are when an internal service provider is unable to complete the request, such as in aggregation or RDE.",
             "An error occurred internal to the service as part of the overall request.  Partial results may have been returned.",
             "Warning",
-            "Warning",
             0,
             {},
             "Resubmit the request.  If the problem persists, consider resetting the service or provider.",
@@ -504,7 +466,6 @@
             "Indicates that one of the internal operations necessary to complete the request timed out.  Examples of this are when an internal service provider is unable to complete the request, such as in aggregation or RDE.",
             "A timeout internal to the service occured as part of the request.  Partial results may have been returned.",
             "Warning",
-            "Warning",
             0,
             {},
             "Resubmit the request.  If the problem persists, consider resetting the service or provider.",
@@ -515,7 +476,6 @@
             "Indicates that the password for the account provided must be changed before accessing the service.  The password can be changed with a PATCH to the `Password` property in the manager account resource instance.  Implementations that provide a default password for an account may require a password change prior to first access to the service.",
             "The password provided for this account must be changed before access is granted.  PATCH the Password property for this account located at the target URI '%1' to complete this process.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -528,7 +488,6 @@
             "Indicates that the ETag supplied did not match the current ETag of the resource.",
             "The ETag supplied did not match the ETag required to change this resource.",
             "Critical",
-            "Critical",
             0,
             {},
             "Try the operation again using the appropriate ETag.",
@@ -539,7 +498,6 @@
             "Indicates that the request did not provide the required precondition such as an `If-Match` or `If-None-Match` header, or `@odata.etag` annotations.",
             "A precondition header or annotation is required to change this resource.",
             "Critical",
-            "Critical",
             0,
             {},
             "Try the operation again using an If-Match or If-None-Match header and appropriate ETag.",
@@ -550,7 +508,6 @@
             "Indicates the property is deprecated.",
             "The deprecated property %1 was included in the request body.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -563,7 +520,6 @@
             "Indicates that a duplicate property was included in the request body.",
             "The property %1 was duplicated in the request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -576,7 +532,6 @@
             "Indicates that a required property was not supplied as part of the request.",
             "The property %1 is a required property and must be included in the request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -589,7 +544,6 @@
             "Indicates that a property was given a value in the request body, but the property is a readonly property.",
             "The property %1 is a read only property and cannot be assigned a value.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -602,7 +556,6 @@
             "Indicates that an unknown property was included in the request body.",
             "The property %1 is not in the list of valid properties for the resource.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -615,7 +568,6 @@
             "Indicates that the requested write of a property value could not be completed, because of a conflict with another property value.",
             "The property '%1' could not be written because its value would conflict with the value of the '%2' property.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -629,7 +581,6 @@
             "Indicates that a property was given a deprecated value.",
             "The value '%1' for the property %2 is deprecated.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -643,7 +594,6 @@
             "Indicates that a property was given an invalid value.",
             "The value provided for the property %1 is not valid.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -656,7 +606,6 @@
             "Indicates that the requested write of a property value could not be completed, due to the current state or configuration of the resource.  This can include configuration conflicts with other resources or parameters that are not exposed by this interface.",
             "The property '%1' with the requested value of '%2' could not be written because the value is not available due to a configuration conflict.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -670,7 +619,6 @@
             "Indicates that a property was given the correct value type but the value of that property was not supported.",
             "The value '%1' for the property %2 is of a different format than the property can accept.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -684,7 +632,6 @@
             "Indicates that the requested write of a property value could not be completed, because of an incorrect value of the property.  Examples include values that do not match a regular expression requirement or passwords that do not match the implementation constraints.",
             "The property '%1' with the requested value of '%2' could not be written because the value does not meet the constraints of the implementation.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -698,7 +645,6 @@
             "Indicates that a property was given the correct value type but the value of that property was modified.  Examples are truncated or rounded values.",
             "The property %1 was assigned the value '%2' due to modification by the service.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -712,7 +658,6 @@
             "Indicates that a property was given the correct value type but the value of that property was not supported.  The value is not in an enumeration.",
             "The value '%1' for the property %2 is not in the list of acceptable values.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -726,7 +671,6 @@
             "Indicates that the requested write of a property value could not be completed, due to the current state or configuration of another resource.",
             "The property '%1' with the requested value of '%2' could not be written because the value conflicts with the state or configuration of the resource at '%3'.",
             "Warning",
-            "Warning",
             3,
             {
                 "string",
@@ -741,7 +685,6 @@
             "Indicates that a property was given the wrong value type, such as when a number is supplied for a property that requires a string.",
             "The value '%1' for the property %2 is of a different type than the property can accept.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -755,7 +698,6 @@
             "Indicates the request contains multiple query parameters, and that two or more of them cannot be used together.",
             "Two or more query parameters in the request cannot be used together.",
             "Warning",
-            "Warning",
             0,
             {},
             "Remove one or more of the query parameters and resubmit the request if the operation failed.",
@@ -766,7 +708,6 @@
             "Indicates that query is not supported on the implementation.",
             "Querying is not supported by the implementation.",
             "Warning",
-            "Warning",
             0,
             {},
             "Remove the query parameters and resubmit the request if the operation failed.",
@@ -777,7 +718,6 @@
             "Indicates that query is not supported with the given operation, such as when the `$expand` query is attempted with a PATCH operation.",
             "Querying is not supported with the requested operation.",
             "Warning",
-            "Warning",
             0,
             {},
             "Remove the query parameters and resubmit the request if the operation failed.",
@@ -788,7 +728,6 @@
             "Indicates that query is not supported on the given resource, such as when the `$skip` query is attempted on a resource that is not a collection.",
             "Querying is not supported on the requested resource.",
             "Warning",
-            "Warning",
             0,
             {},
             "Remove the query parameters and resubmit the request if the operation failed.",
@@ -799,7 +738,6 @@
             "Indicates that a query parameter was provided that is out of range for the given resource.  This can happen with values that are too low or beyond that possible for the supplied resource, such as when a page is requested that is beyond the last page.",
             "The value '%1' for the query parameter %2 is out of range %3.",
             "Warning",
-            "Warning",
             3,
             {
                 "string",
@@ -814,7 +752,6 @@
             "Indicates that a query parameter was given an invalid value.",
             "The value for the parameter %1 is invalid.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -827,7 +764,6 @@
             "Indicates that a query parameter was given the correct value type but the value of that parameter was not supported.  This includes the value size or length has been exceeded.",
             "The value '%1' for the parameter %2 is of a different format than the parameter can accept.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -841,7 +777,6 @@
             "Indicates that a query parameter was given the wrong value type, such as when a number is supplied for a query parameter that requires a string.",
             "The value '%1' for the query parameter %2 is of a different type than the parameter can accept.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -855,7 +790,6 @@
             "Indicates that a component reset is required for changes or operations to complete.",
             "In order to complete the operation, a component reset is required with the Reset action URI '%1' and ResetType '%2'.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -869,7 +803,6 @@
             "Indicates that a resource change or creation was attempted but that the operation cannot proceed because the resource already exists.",
             "The requested resource of type %1 with the property %2 with the value '%3' already exists.",
             "Critical",
-            "Critical",
             3,
             {
                 "string",
@@ -884,7 +817,6 @@
             "Indicates that the URI was valid but the resource or image at that URI was in a format not supported by the service.",
             "The resource at '%1' is in a format not recognized by the service.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -897,7 +829,6 @@
             "Indicates that the attempt to access the resource, file, or image at the URI was unauthorized.",
             "While accessing the resource at '%1', the service received an authorization error '%2'.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -911,7 +842,6 @@
             "Indicates that a delete operation was attempted on a resource that cannot be deleted.",
             "The delete request failed because the resource requested cannot be deleted.",
             "Critical",
-            "Critical",
             0,
             {},
             "Do not attempt to delete a non-deletable resource.",
@@ -922,7 +852,6 @@
             "Indicates that the requested resource creation could not be completed because the service has a resource that conflicts with the request.",
             "The resource could not be created.  The service has a resource at URI '%1' that conflicts with the creation request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -935,7 +864,6 @@
             "Indicates the resource is deprecated.",
             "The operation was performed on a deprecated resource '%1'.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -948,7 +876,6 @@
             "Indicates that a resource could not satisfy the request due to some unavailability of resources.  An example is that available capacity has been allocated.",
             "The resource '%1' was unable to satisfy the request due to unavailability of resources.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -961,7 +888,6 @@
             "Indicates that the request could not be performed because the resource is in standby.",
             "The request could not be performed because the resource is in standby.",
             "Critical",
-            "Critical",
             0,
             {},
             "Ensure that the resource is in the correct power state and resubmit the request.",
@@ -972,7 +898,6 @@
             "Indicates that a change was requested to a resource but the change was rejected due to the resource being in use or transition.",
             "The change to the requested resource failed because the resource is in use or in transition.",
             "Warning",
-            "Warning",
             0,
             {},
             "Remove the condition and resubmit the request if the operation failed.",
@@ -983,7 +908,6 @@
             "Indicates that the operation expected an image or other resource at the provided URI but none was found.  Examples of this are in requests that require URIs like firmware update.",
             "The resource at the URI '%1' was not found.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -996,7 +920,6 @@
             "Indicates that the operation expected a resource identifier that corresponds to an existing resource but one was not found.",
             "The requested resource of type %1 named '%2' was not found.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -1010,7 +933,6 @@
             "Indicates that the resource type of the operation does not match that for the operation destination.  Examples of when this can happen include during a POST to a resource collection using the wrong resource type, an update where the `@odata.type` properties do not match, or on a major version incompatibility.",
             "The @odata.type of the request body %1 is incompatible with the @odata.type of the resource, which is %2.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -1024,7 +946,6 @@
             "Indicates that the operation was not successful because a privilege is restricted.",
             "The operation was not successful because the privilege '%1' is restricted.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -1037,7 +958,6 @@
             "Indicates that the operation was not successful because the role is restricted.",
             "The operation was not successful because the role '%1' is restricted.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -1050,7 +970,6 @@
             "Indicates that the operation failed because the service, such as the account service, is disabled and cannot accept requests.",
             "The operation failed because the service at %1 is disabled and cannot accept requests.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -1063,7 +982,6 @@
             "Indicates that the operation failed because the service is in an unknown state and cannot accept additional requests.",
             "The operation failed because the service is in an unknown state and can no longer take incoming requests.",
             "Critical",
-            "Critical",
             0,
             {},
             "Restart the service and resubmit the request if the operation failed.",
@@ -1074,7 +992,6 @@
             "Indicates that the operation failed as the service is shutting down, such as when the service reboots.",
             "The operation failed because the service is shutting down and can no longer take incoming requests.",
             "Critical",
-            "Critical",
             0,
             {},
             "When the service becomes available, resubmit the request if the operation failed.",
@@ -1085,7 +1002,6 @@
             "Indicates the service is temporarily unavailable.",
             "The service is temporarily unavailable.  Retry in %1 seconds.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -1098,7 +1014,6 @@
             "Indicates that a session establishment has been requested but the operation failed due to the number of simultaneous sessions exceeding the limit of the implementation.",
             "The session establishment failed due to the number of simultaneous sessions exceeding the limit of the implementation.",
             "Critical",
-            "Critical",
             0,
             {},
             "Reduce the number of other sessions before trying to establish the session or increase the limit of simultaneous sessions, if supported.",
@@ -1109,7 +1024,6 @@
             "Indicates that the DELETE operation on the session resource resulted in the successful termination of the session.",
             "The session was successfully terminated.",
             "OK",
-            "OK",
             0,
             {},
             "No resolution is required.",
@@ -1120,7 +1034,6 @@
             "Indicates that while attempting to access, connect to or transfer a resource, file, or image from another location that the other end of the connection did not support the protocol.",
             "The other end of the connection at '%1' does not support the specified protocol %2.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -1134,7 +1047,6 @@
             "Indicates the request failed because a set of `AccountTypes` or `OEMAccountTypes` was not accepted while `StrictAccountTypes` is set to `true`.",
             "The request was not possible to fulfill with the account types included in property '%1' and property StrictAccountTypes set to true.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -1147,7 +1059,6 @@
             "Indicates that a string value passed to the given resource exceeded its length limit.  An example is when a shorter limit is imposed by an implementation than that allowed by the specification.",
             "The string '%1' exceeds the length limit %2.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -1161,7 +1072,6 @@
             "An event subscription has been terminated by the service.  No further events will be delivered.",
             "The event subscription has been terminated.",
             "OK",
-            "OK",
             0,
             {},
             "No resolution is required.",
@@ -1172,7 +1082,6 @@
             "Indicates that all conditions of a successful operation have been met.",
             "The request completed successfully.",
             "OK",
-            "OK",
             0,
             {},
             "None",
@@ -1183,7 +1092,6 @@
             "Indicates that a fault or error condition exists but the source of the fault cannot be determined or is unknown to the service.",
             "A undetermined fault condition has been reported by '%1'.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -1196,7 +1104,6 @@
             "Indicates that the service encountered an unrecognizable request body that could not even be interpreted as malformed JSON.",
             "The service detected a malformed request body that it was unable to interpret.",
             "Warning",
-            "Warning",
             0,
             {},
             "Correct the request body and resubmit the request if it failed.",
diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
index 401babf..9a8c0f6 100644
--- a/redfish-core/include/registries/openbmc_message_registry.hpp
+++ b/redfish-core/include/registries/openbmc_message_registry.hpp
@@ -36,7 +36,6 @@
             "Indicates an ADDDC Correctable Error.",
             "ADDDC Correctable Error.Socket=%1 Channel=%2 DIMM=%3 Rank=%4.",
             "Warning",
-            "Warning",
             4,
             {
                 "number",
@@ -52,7 +51,6 @@
             "Indicates that At-Scale Debug enable is detected in hardware.",
             "At-Scale Debug Feature is enabled in hardware.",
             "Critical",
-            "Critical",
             0,
             {},
             "None.",
@@ -63,7 +61,6 @@
             "Indicates that At-Scale Debug disable is detected in hardware.",
             "At-Scale Debug Feature is disabled in hardware.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -73,7 +70,6 @@
                      "Indicates that At-Scale Debug service is started.",
                      "At-Scale Debug service is started.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -83,7 +79,6 @@
                      "Indicates that At-Scale Debug service is stopped.",
                      "At-Scale Debug service is stopped.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -93,7 +88,6 @@
                      "Indicates At-Scale Debug connection has been established",
                      "At-Scale Debug service is now connected %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -103,7 +97,6 @@
                      "Indicates At-Scale Debug connection has ended",
                      "At-Scale Debug service is now disconnected",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -113,7 +106,6 @@
                      "Indicates At-Scale Debug connection aborted/failed",
                      "At-Scale Debug connection aborted/failed",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -123,7 +115,6 @@
                      "Indicates that special user is enabled.",
                      "At-Scale Debug special user is enabled",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -133,7 +124,6 @@
                      "Indicates that special user is disabled.",
                      "At-Scale Debug special user is disabled",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -145,7 +135,6 @@
             "Indicates BIOS has transitioned control to the OS Loader.",
             "BIOS System Boot.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -155,7 +144,6 @@
                      "Indicates the reason for BIOS firmware panic.",
                      "BIOS firmware panic occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -167,7 +155,6 @@
                      "Indicates the reason for BIOS firmware recovery.",
                      "BIOS firmware recovery occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -179,7 +166,6 @@
                      "Indicates BIOS firmware encountered resilience error.",
                      "BIOS firmware resiliency error. Error reason: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {
                          "string",
@@ -192,7 +178,6 @@
             "BIOS Power-On Self-Test Code received",
             "Boot Count: %1; Time Stamp Offset: %2 seconds; POST Code: %3",
             "OK",
-            "OK",
             3,
             {"number", "number", "number"},
             "None.",
@@ -202,7 +187,6 @@
                      "Indicates BIOS POST has encountered an error.",
                      "BIOS POST Error. Error Code=%1",
                      "Warning",
-                     "Warning",
                      1,
                      {"number"},
                      "None.",
@@ -212,7 +196,6 @@
                      "Indicates BIOS Recovery has completed.",
                      "BIOS Recovery Complete.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -222,7 +205,6 @@
                      "Indicates BIOS Recovery has started.",
                      "BIOS Recovery Start.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -232,7 +214,6 @@
                      "Indicates the reason why BMC firmware booted.",
                      "BMC firmware version %1 booted due to %2.",
                      "OK",
-                     "OK",
                      2,
                      {
                          "string",
@@ -245,7 +226,6 @@
                      "Indicates the reason for last BMC firmware panic.",
                      "BMC firmware panic occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -257,7 +237,6 @@
                      "Indicates the reason for last BMC firmware recovery.",
                      "BMC firmware recovery occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -269,7 +248,6 @@
                      "Indicates BMC firmware encountered resilience error.",
                      "BMC firmware resiliency error. Error reason: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {
                          "string",
@@ -281,7 +259,6 @@
                      "Indicates that BMC kernel panic occurred.",
                      "BMC rebooted due to kernel panic.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -292,7 +269,6 @@
                      "of the chassis intrusion has occurred.",
                      "Chassis Intrusion Detected.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -302,7 +278,6 @@
                      "Indicates that chassis intrusion status has recovered.",
                      "Chassis Intrusion Reset.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -313,7 +288,6 @@
             "Indicates that the specified component is over temperature.",
             "%1 over temperature and being throttled.",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "None.",
@@ -323,7 +297,6 @@
                      "Indicates the reason for CPLD firmware panic.",
                      "CPLD firmware panic occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -335,7 +308,6 @@
                      "Indicates the reason for CPLD firmware recovery.",
                      "CPLD firmware recovery occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -347,7 +319,6 @@
                      "Indicates CPLD firmware encountered resilience error.",
                      "CPLD firmware resiliency error. Error reason: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {
                          "string",
@@ -360,7 +331,6 @@
                      "the specified type or cause.",
                      "CPU Error Occurred: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -371,7 +341,6 @@
                      "rating is incompatible with the board.",
                      "CPU %1 Mismatch.",
                      "Critical",
-                     "Critical",
                      1,
                      {"number"},
                      "Install the supported CPU.",
@@ -382,7 +351,6 @@
                      "trip has been asserted.",
                      "CPU %1 Thermal Trip.",
                      "Critical",
-                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -392,7 +360,6 @@
                      "Indicates that the system DC power is off.",
                      "Host system DC power is off",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -402,7 +369,6 @@
                      "Indicates that the system DC power is on.",
                      "Host system DC power is on",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -413,7 +379,6 @@
                      "the specified type or cause.",
                      "Drive Error Occurred: %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -423,7 +388,6 @@
                      "Indicates that the event log has been cleared.",
                      "Event Log Cleared.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -433,7 +397,6 @@
                      "Indicates that a system fan has been inserted.",
                      "%1 inserted.",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -443,7 +406,6 @@
                      "Indicates that system fan redundancy has been lost.",
                      "Fan redundancy lost.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -453,7 +415,6 @@
                      "Indicates that system fan redundancy has been regained.",
                      "Fan redundancy regained.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -463,8 +424,7 @@
                      "Indicates that a system fan has been removed.",
                      "%1 removed.",
                      "OK",
-                     "OK",
-                     1,
+                     0,
                      {"string"},
                      "None.",
                  }},
@@ -474,7 +434,6 @@
             "Indicates a firmware activation has completed successfully.",
             "%1 firmware activation completed successfully.",
             "OK",
-            "OK",
             1,
             {"string"},
             "None.",
@@ -484,7 +443,6 @@
                      "Indicates a firmware activation has failed.",
                      "%1 firmware activation failed: %2.",
                      "Warning",
-                     "Warning",
                      2,
                      {"string", "string"},
                      "None.",
@@ -494,7 +452,6 @@
                      "Indicates a firmware activation has started.",
                      "%1 firmware activation started.",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -504,7 +461,6 @@
                      "Indicates firmware encountered resilience error.",
                      "Firmware resiliency error. Error reason: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {
                          "string",
@@ -517,7 +473,6 @@
                      "%1 firmware update to version %2 completed "
                      "successfully.",
                      "OK",
-                     "OK",
                      2,
                      {"string", "string"},
                      "None.",
@@ -527,7 +482,6 @@
                      "Indicates a firmware update has failed.",
                      "%1 firmware update to version %2 failed: %3.",
                      "Warning",
-                     "Warning",
                      3,
                      {"string", "string", "string"},
                      "None.",
@@ -537,7 +491,6 @@
                      "Indicates a firmware update has staged successfully.",
                      "%1 firmware update to version %2 staged successfully.",
                      "OK",
-                     "OK",
                      2,
                      {"string", "string"},
                      "None.",
@@ -547,7 +500,6 @@
                      "Indicates a firmware update has started.",
                      "%1 firmware update to version %2 started.",
                      "OK",
-                     "OK",
                      2,
                      {"string", "string"},
                      "None.",
@@ -558,7 +510,6 @@
             "Indicates a general firmware security violation has occurred.",
             "Firmware security violation: %1.",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "None.",
@@ -569,7 +520,6 @@
                      "interface with an invalid username or password.",
                      "Invalid username or password attempted on %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -579,7 +529,6 @@
                      "Indicates that the uploaded file was invalid.",
                      "Invalid file uploaded to %1: %2.",
                      "Warning",
-                     "Warning",
                      2,
                      {"string", "string"},
                      "None.",
@@ -591,7 +540,6 @@
             "type, and serial number was installed.",
             "%1 %2 with serial number %3 was installed.",
             "OK",
-            "OK",
             3,
 
             {
@@ -608,7 +556,6 @@
             "type, and serial number was removed.",
             "%1 %2 with serial number %3 was removed.",
             "OK",
-            "OK",
             3,
 
             {
@@ -624,7 +571,6 @@
             "Indicates Intel UPI link width has reduced to half width.",
             "Intel UPI link width reduced to half. Node=%1.",
             "Warning",
-            "Warning",
             1,
 
             {
@@ -638,7 +584,6 @@
             "Indicates Intel UPI link width has reduced to quarter width.",
             "Intel UPI link width reduced to quarter. Node=%1.",
             "Warning",
-            "Warning",
             1,
 
             {
@@ -652,9 +597,7 @@
                      "Indicates that there is a host watchdog event.",
                      "Host Watchdog Event: %1",
                      "OK",
-                     "OK",
                      1,
-
                      {
                          "string",
                      },
@@ -666,7 +609,6 @@
                      "of the LAN leash has lost.",
                      "%1 LAN leash lost.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -678,7 +620,6 @@
                      "Indicates that LAN link status has reconnected.",
                      "%1 LAN leash regained.",
                      "OK",
-                     "OK",
                      1,
                      {
                          "string",
@@ -690,7 +631,6 @@
                      "Indicates a Legacy PCI PERR.",
                      "Legacy PCI PERR. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -705,7 +645,6 @@
                      "Indicates a Legacy PCI SERR.",
                      "Legacy PCI SERR. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -721,7 +660,6 @@
                      "or Manufacturing mode.",
                      "Entered Manufacturing Mode.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -732,7 +670,6 @@
                      "or Manufacturing mode.",
                      "Exited Manufacturing Mode.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -745,7 +682,6 @@
                      "monitoring, limiting and HW protection features might "
                      "be unavailable. Failure reason: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "Ensure that Intel ME configuration for power "
@@ -760,7 +696,6 @@
             "Determined sources for domain readings are: DC Power: %1 ; "
             "Chassis Power: %2 ; PSU Efficiency: %3 ; Unamanaged power: %4",
             "OK",
-            "OK",
             4,
             {"string", "string", "string", "string"},
             "None.",
@@ -772,7 +707,6 @@
                      "Intel ME has detected following issue with Intel Boot "
                      "Guard: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -783,7 +717,6 @@
                      "which CPU Debug Capability is disabled.",
                      "CPU Debug Capability disabled",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -795,7 +728,6 @@
                      "Intel ME Firmware switched to recovery mode to perform "
                      "full update from BIOS.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "This is transient state. Intel ME Firmware should "
@@ -811,7 +743,6 @@
             "failure action and Intel ME forced shutdown. BMC probably did "
             "not respond correctly to Chassis Control.",
             "Warning",
-            "Warning",
             0,
             {},
             "Verify the Intel Node Manager policy configuration.",
@@ -823,7 +754,6 @@
             "Intel ME has performed automatic reset to factory "
             "presets due to following reason: %1",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "If error is persistent the Flash device must be replaced.",
@@ -835,7 +765,6 @@
             "Intel ME has performed automatic reset to factory "
             "presets due to following reason: %1",
             "OK",
-            "OK",
             1,
             {"string"},
             "If error is persistent the Flash device must be replaced.",
@@ -847,7 +776,6 @@
             "exception during execution.",
             "Intel ME has encountered firmware exception. Error code = %1",
             "Warning",
-            "Warning",
             1,
             {"string"},
             "Restore factory presets using Force ME Recovery IPMI "
@@ -863,7 +791,6 @@
                      "Indicates the reason for ME firmware panic.",
                      "ME firmware panic occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -875,7 +802,6 @@
                      "Indicates the reason for ME firmware recovery.",
                      "ME firmware recovery occurred due to %1.",
                      "Warning",
-                     "Warning",
                      1,
                      {
                          "string",
@@ -887,7 +813,6 @@
                      "Indicates ME firmware encountered resilience error.",
                      "ME firmware resiliency error. Error reason: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {
                          "string",
@@ -902,7 +827,6 @@
                      "Intel ME has encountered an error during Flash erasure "
                      "procedure probably due to Flash part corruption.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "The Flash device must be replaced.",
@@ -914,7 +838,6 @@
                      "Intel ME has encountered problem during IO to flash "
                      "device. Reason: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "If flash wear-out protection occurred wait until it "
@@ -927,7 +850,6 @@
                      "Intel ME has encountered problem during IO to flash "
                      "device. Reason: %1",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "If flash wear-out protection occurred wait until it "
@@ -940,7 +862,6 @@
                      "Intel ME has detected invalid flash descriptor region. "
                      "Following error is detected: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "Flash Descriptor Region must be created correctly.",
@@ -953,7 +874,6 @@
             "Warning threshold for number of flash operations has been "
             "exceeded. Current percentage of write operations capacity: %1",
             "Warning",
-            "Warning",
             1,
             {"number"},
             "No immediate repair action needed.",
@@ -968,7 +888,6 @@
             "may be either caused by Flash device corruption or "
             "failed upgrade procedure.",
             "Critical",
-            "Critical",
             0,
             {},
             "Either the Flash device must be replaced (if error is "
@@ -983,7 +902,6 @@
             "Error during Intel ME execution. Watchdog "
             "timeout has expired.",
             "Critical",
-            "Critical",
             0,
             {},
             "Firmware should automatically recover from error state. "
@@ -997,7 +915,6 @@
                      "Wrong manufacturing configuration detected by Intel ME "
                      "Firmware. Unable to start operational mode. Reason: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      " If error is persistent the Flash device must be "
@@ -1013,7 +930,6 @@
                      "when MCTP was not configured by BIOS or a defect which "
                      "may need a Host reset to recover from. Details: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "Recovery via CPU Host reset or platform reset. If error "
@@ -1026,7 +942,6 @@
                      "Memory ECC correctable error. Socket=%1 "
                      "Channel=%2 DIMM=%3 Rank=%4.",
                      "Warning",
-                     "Warning",
                      4,
 
                      {
@@ -1043,7 +958,6 @@
                      "Memory ECC uncorrectable error. Socket=%1 Channel=%2 "
                      "DIMM=%3 Rank=%4.",
                      "Critical",
-                     "Critical",
                      4,
 
                      {
@@ -1060,7 +974,6 @@
                      "Command and Address parity error. Socket=%1 Channel=%2 "
                      "DIMM=%3 ChannelValid=%4 DIMMValid=%5.",
                      "Critical",
-                     "Critical",
                      5,
 
                      {
@@ -1078,7 +991,6 @@
                      "Memory parity error. Socket=%1 Channel=%2 "
                      "DIMM=%3 ChannelValid=%4 DIMMValid=%5.",
                      "Critical",
-                     "Critical",
                      5,
 
                      {
@@ -1095,9 +1007,7 @@
                      "Indicates Memory RAS Disabled Configuration Status.",
                      "Memory RAS Configuration Disabled. Error=%1 Mode=%2.",
                      "OK",
-                     "OK",
                      2,
-
                      {
                          "string",
                          "string",
@@ -1109,9 +1019,7 @@
                      "Indicates Memory RAS Enabled Configuration Status.",
                      "Memory RAS Configuration Enabled. Error=%1 Mode=%2.",
                      "OK",
-                     "OK",
                      2,
-
                      {
                          "string",
                          "string",
@@ -1124,9 +1032,7 @@
                      "Memory RAS Mode Select Disabled. Prior Mode=%1 "
                      "Selected Mode=%2.",
                      "OK",
-                     "OK",
                      2,
-
                      {
                          "string",
                          "string",
@@ -1139,9 +1045,7 @@
                      "Memory RAS Mode Select Enabled. Prior Mode=%1 Selected "
                      "Mode=%2.",
                      "OK",
-                     "OK",
                      2,
-
                      {
                          "string",
                          "string",
@@ -1154,7 +1058,6 @@
                      "by the specified component.",
                      "Memory ThermTrip asserted: %1.",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1165,7 +1068,6 @@
                      "problems in initializing Multi-PCH mode.",
                      "Intel ME error in Multi-PCH mode: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1181,7 +1083,6 @@
             "BIOS or a defect which may require a CPU Host reset to "
             "recover from. Details: %1",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "Recovery via CPU Host reset or platform reset. If error is "
@@ -1193,7 +1094,6 @@
             "Indicates that Intel ME has encountered issue with Intel PTT",
             "Intel ME has detected following issue with Intel PTT: %1",
             "Warning",
-            "Warning",
             1,
             {"string"},
             "None.",
@@ -1207,7 +1107,6 @@
             "pin asserted. Pin number is configurable in factory "
             "presets, Default recovery pin is MGPIO1.",
             "OK",
-            "OK",
             0,
             {},
             "Deassert recovery GPIO and reset the Intel ME back to "
@@ -1220,7 +1119,6 @@
                      "Indicates events related to Intel ME restricted mode.",
                      "Intel ME restricted mode information: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1232,7 +1130,6 @@
             "Intel ME has detected SMBus link error. "
             "Sensor Bus: %1 , MUX Address: %2 ",
             "Critical",
-            "Critical",
             2,
             {"string", "string"},
             "Devices connected to given SMLINK might cause communication "
@@ -1245,7 +1142,6 @@
             "Indicates that Intel ME has encountered UMA operation error.",
             "Intel ME has encountered UMA operation error. Details: %1",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "Platform reset when UMA not configured correctly, or when "
@@ -1260,7 +1156,6 @@
                      "Feature not supported in current segment detected by "
                      "Intel ME Firmware. Details: %1",
                      "Critical",
-                     "Critical",
                      1,
                      {"string"},
                      "Proper FW configuration must be updated or use the "
@@ -1272,7 +1167,6 @@
                      "Mirroring redundancy state degraded. Socket=%1 "
                      "Channel=%2 DIMM=%3 Pair=%4 Rank=%5.",
                      "Warning",
-                     "Warning",
                      5,
 
                      {
@@ -1291,7 +1185,6 @@
             "Mirroring redundancy state fully redundant. Socket=%1 "
             "Channel=%2 DIMM=%3 Pair=%4 Rank=%5.",
             "OK",
-            "OK",
             5,
 
             {
@@ -1308,7 +1201,6 @@
                      "Indicates that the NMI button was pressed.",
                      "NMI Button Pressed.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1319,7 +1211,6 @@
                      "Interrupt has been generated.",
                      "NMI Diagnostic Interrupt.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1330,7 +1221,6 @@
                      "PCIe Correctable Advisory Non-fatal Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1346,7 +1236,6 @@
 
                      "PCIe Correctable Bad DLLP. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1362,7 +1251,6 @@
 
                      "PCIe Correctable Bad TLP. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1378,7 +1266,6 @@
                      "PCIe Correctable Header Log Overflow. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1394,7 +1281,6 @@
                      "PCIe Correctable Internal Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1410,7 +1296,6 @@
                      "PCIe Correctable Link BW Changed. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1426,7 +1311,6 @@
                      "PCIe Correctable Receiver Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1442,7 +1326,6 @@
                      "PCIe Correctable Replay Num Rollover. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1458,7 +1341,6 @@
                      "PCIe Correctable Replay Timer Timeout. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1474,7 +1356,6 @@
                      "PCIe Correctable Unspecified AER Error. "
                      "Bus=%1 Device=%2 Function=%3.",
                      "Warning",
-                     "Warning",
                      3,
 
                      {
@@ -1490,7 +1371,6 @@
 
                      "PCIe Fatal ACS Violation. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1506,7 +1386,6 @@
                      "PCIe Fatal Atomic Egress Blocked. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1523,7 +1402,6 @@
 
             "PCIe Fatal Completer Abort. Bus=%1 Device=%2 Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1540,7 +1418,6 @@
 
             "PCIe Fatal Completion Timeout. Bus=%1 Device=%2 Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1558,7 +1435,6 @@
             "PCIe Fatal Data Link Layer Protocol Error. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1573,7 +1449,6 @@
                      "Indicates a PCIe ECRC Error.",
                      "PCIe Fatal ECRC Error. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1590,7 +1465,6 @@
                      "PCIe Fatal Flow Control Protocol Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1607,7 +1481,6 @@
 
             "PCIe Fatal Malformed TLP Error. Bus=%1 Device=%2 Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1623,7 +1496,6 @@
                      "PCIe Fatal MC Blocked TLP Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1640,7 +1512,6 @@
 
             "PCIe Fatal Poisoned TLP Error. Bus=%1 Device=%2 Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1656,7 +1527,6 @@
                      "PCIe Fatal Receiver Buffer Overflow. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1674,7 +1544,6 @@
             "PCIe Fatal Received ERR_NONFATAL Message. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1692,7 +1561,6 @@
                      "PCIe Fatal Received Fatal Message From Downstream. "
                      "Bus=%1 Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1708,7 +1576,6 @@
                      "PCIe Fatal Surprise Link Down Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1724,7 +1591,6 @@
                      "PCIe Fatal TLP Prefix Blocked Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1742,7 +1608,6 @@
             "PCIe Fatal Uncorrectable Internal Error. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1758,7 +1623,6 @@
                      "PCIe Fatal Unexpected Completion. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1774,7 +1638,6 @@
                      "PCIe Fatal Unspecified Non-AER Fatal Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Critical",
-                     "Critical",
                      3,
 
                      {
@@ -1791,7 +1654,6 @@
 
             "PCIe Fatal Unsupported Request. Bus=%1 Device=%2 Function=%3.",
             "Critical",
-            "Critical",
             3,
 
             {
@@ -1806,7 +1668,6 @@
                      "Indicates that the power button was pressed.",
                      "Power Button Pressed.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -1817,7 +1678,6 @@
                      "BMC has applied the restore policy.",
                      "Power restore policy applied.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -1827,7 +1687,6 @@
                      "Indicates an error in power supply configuration.",
                      "Power supply %1 configuration error.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1839,7 +1698,6 @@
             "from a failure.",
             "Power supply %1 configuration error recovered.",
             "OK",
-            "OK",
             1,
             {"string"},
             "None.",
@@ -1850,7 +1708,6 @@
             "Indicates that the specified power supply fan has failed.",
             "Power supply %1 fan %2 failed.",
             "Warning",
-            "Warning",
             2,
             {"string", "string"},
             "None.",
@@ -1861,7 +1718,6 @@
             "Indicates that the power supply fan recovered from a failure.",
             "Power supply %1 fan %2 recovered.",
             "OK",
-            "OK",
             2,
             {"string", "string"},
             "None.",
@@ -1871,7 +1727,6 @@
                      "Indicates that a power supply has failed.",
                      "Power supply %1 failed.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1881,7 +1736,6 @@
                      "Indicates that a power supply is predicted to fail.",
                      "Power supply %1 failure predicted.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1891,7 +1745,6 @@
                      "Indicates that a power supply has been inserted.",
                      "Power supply %1 inserted.",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1903,7 +1756,6 @@
                      "Power supply power good failed to assert within %1 "
                      "milliseconds.",
                      "Critical",
-                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -1913,7 +1765,6 @@
                      "Indicates that a power supply has lost input power.",
                      "Power supply %1 power lost.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1923,8 +1774,7 @@
                      "Indicates that a power supply input power was restored.",
                      "Power supply %1 power restored.",
                      "OK",
-                     "OK",
-                     1,
+                     0,
                      {"string"},
                      "None.",
                  }},
@@ -1934,7 +1784,6 @@
                      "from a predicted failure.",
                      "Power supply %1 predicted failure recovered.",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1944,7 +1793,6 @@
                      "Indicates that a power supply recovered from a failure.",
                      "Power supply %1 recovered.",
                      "OK",
-                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1954,7 +1802,6 @@
                      "Indicates that a power supply has been removed.",
                      "Power supply %1 removed.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1965,7 +1812,6 @@
                      "nonredundant but is still not in full redundancy mode.",
                      "Power Unit degraded from nonredundant.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1976,7 +1822,6 @@
                      "redundancy mode.",
                      "Power Unit degraded from redundant.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1986,7 +1831,6 @@
                      "Indicates that power unit redundancy has been degraded.",
                      "Power Unit Redundancy degraded.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -2000,7 +1844,6 @@
 
             "Power Unit NonRedundant from insufficient to sufficient.",
             "Warning",
-            "Warning",
             0,
             {},
             "None.",
@@ -2011,7 +1854,6 @@
                      "power to support redundancy.",
                      "Power Unit NonRedundant and has insufficient resource.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2021,7 +1863,6 @@
                      "Indicates that power unit redundancy has been lost.",
                      "Power Unit Redundancy lost.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -2032,7 +1873,6 @@
             "Indicates that power unit full redundancy has been regained.",
             "Power Unit Redundancy regained.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -2044,7 +1884,6 @@
             "has sufficient power to support redundancy.",
             "Power Unit Nonredundant but has sufficient resource.",
             "Warning",
-            "Warning",
             0,
             {},
             "None.",
@@ -2054,7 +1893,6 @@
                      "Indicates that the reset button was pressed.",
                      "Reset Button Pressed.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -2064,7 +1902,6 @@
                      "Indicates that the BMC 2nd boot flash is enabled.",
                      "BMC 2nd boot flash is enabled.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2074,7 +1911,6 @@
                      "Indicates that the P2A bridge is enabled.",
                      "P2A(PCIe to AHB) bridge is enabled.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2084,7 +1920,6 @@
                      "Indicates that the uart port debug is enabled.",
                      "Uart port debug is enabled.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2095,7 +1930,6 @@
             "Indicates that password computing hash algorithm changed.",
             "Password computing hash algorithm is changed to sha256/sha512.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -2106,7 +1940,6 @@
                      "Indicates that non root user assigned with user ID zero.",
                      "User ID Zero is assigned with non-root user.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2116,7 +1949,6 @@
                      "Indicates that non root user ID is removed",
                      "Non root user assigned with user ID zero is removed.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -2127,7 +1959,6 @@
                      "Indicates that system root user is enabled.",
                      "User root is enabled.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2137,7 +1968,6 @@
                      "Indicates that system root user is disabled.",
                      "User root is disabled.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -2148,7 +1978,6 @@
                      "Indicates that unsupported shell is enabled.",
                      "Unsupported shell is enabled.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2158,7 +1987,6 @@
                      "Indicates that unsupported shell is removed.",
                      "Unsupported shell is removed.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -2170,7 +1998,6 @@
             "Indicates that weak password computing hash algorithm is enabled.",
             "Weak password computing hash algorithm is enabled.",
             "Critical",
-            "Critical",
             0,
             {},
             "None.",
@@ -2181,9 +2008,7 @@
                      "Add SEL Entry or Platform Event command.",
                      "SEL Entry Added: %1",
                      "OK",
-                     "OK",
                      1,
-
                      {
                          "string",
                      },
@@ -2196,7 +2021,6 @@
                      "%1 sensor crossed a critical high threshold going "
                      "high. Reading=%2 Threshold=%3.",
                      "Critical",
-                     "Critical",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2208,7 +2032,6 @@
                      "%1 sensor crossed a critical high threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
-                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2220,7 +2043,6 @@
                      "%1 sensor crossed a critical low threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
-                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2232,7 +2054,6 @@
                      "%1 sensor crossed a critical low threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "Critical",
-                     "Critical",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2244,7 +2065,6 @@
                      "%1 sensor crossed a warning high threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "Warning",
-                     "Warning",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2256,7 +2076,6 @@
                      "%1 sensor crossed a warning high threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
-                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2268,7 +2087,6 @@
                      "%1 sensor crossed a warning low threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
-                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2280,7 +2098,6 @@
                      "%1 sensor crossed a warning low threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "Warning",
-                     "Warning",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2290,7 +2107,6 @@
                      "Indicates that a service has exited unsuccessfully.",
                      "Service %1 has exited unsuccessfully.",
                      "Warning",
-                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -2301,7 +2117,6 @@
                      "Sparing redundancy state degraded. Socket=%1 "
                      "Channel=%2 DIMM=%3 Domain=%4 Rank=%5.",
                      "Warning",
-                     "Warning",
                      5,
 
                      {
@@ -2320,7 +2135,6 @@
             "Sparing redundancy state fully redundant. Socket=%1 "
             "Channel=%2 DIMM=%3 Domain=%4 Rank=%5.",
             "OK",
-            "OK",
             5,
 
             {
@@ -2337,7 +2151,6 @@
                      "Indicates that an SSB Thermal trip has been asserted.",
                      "SSB Thermal trip.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2350,7 +2163,6 @@
                      "The system interface is in the disabled provisioned "
                      "state.",
                      "OK",
-                     "OK",
                      0,
                      {},
                      "None.",
@@ -2362,7 +2174,6 @@
                      "execute through the system interface.",
                      "The system interface is in the unprovisioned state.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2375,7 +2186,6 @@
                      "The system interface is in the whitelist provisioned "
                      "state.",
                      "Warning",
-                     "Warning",
                      0,
                      {},
                      "None.",
@@ -2387,7 +2197,6 @@
                      "System power good failed to assert within %1 "
                      "milliseconds (VR failure).",
                      "Critical",
-                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -2398,7 +2207,6 @@
                      "system was powered on.",
                      "System Power Lost.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2408,7 +2216,6 @@
                      "Indicates that the system failed to power off.",
                      "System Power-Off Failed.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2418,7 +2225,6 @@
                      "Indicates that the system failed to power on.",
                      "System Power-On Failed.",
                      "Critical",
-                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2429,7 +2235,6 @@
             "Indicates that the specified voltage regulator overheated.",
             "%1 Voltage Regulator Overheated.",
             "Critical",
-            "Critical",
             1,
             {"string"},
             "None.",
diff --git a/redfish-core/include/registries/resource_event_message_registry.hpp b/redfish-core/include/registries/resource_event_message_registry.hpp
index de122d0..5a70355 100644
--- a/redfish-core/include/registries/resource_event_message_registry.hpp
+++ b/redfish-core/include/registries/resource_event_message_registry.hpp
@@ -37,7 +37,6 @@
             "Indicates that a license has been added.",
             "A license for '%1' has been added.  The following message was returned: '%2'.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -51,7 +50,6 @@
             "Indicates that a license has changed.",
             "A license for '%1' has changed.  The following message was returned: '%2'.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -65,7 +63,6 @@
             "Indicates that a license has expired.",
             "A license for '%1' has expired.  The following message was returned: '%2'.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -79,7 +76,6 @@
             "Indicates that one or more resource properties have changed.  This is not used whenever there is another event message for that specific change, such as only the state has changed.",
             "One or more resource properties have changed.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -90,7 +86,6 @@
             "Indicates that all conditions of a successful creation operation have been met.",
             "The resource has been created successfully.",
             "OK",
-            "OK",
             0,
             {},
             "None",
@@ -101,7 +96,6 @@
             "Indicates that a specified resource property has cleared its error threshold.  Examples would be drive I/O errors, or network link errors.",
             "The resource property %1 has cleared the error threshold of value %2.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -115,7 +109,6 @@
             "Indicates that a specified resource property has exceeded its error threshold.  Examples would be drive I/O errors, or network link errors.",
             "The resource property %1 has exceeded error threshold of value %2.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -129,7 +122,6 @@
             "Indicates that a specified resource property has corrected errors.  Examples would be drive I/O errors, or network link errors.",
             "The resource property %1 has corrected errors of type '%2'.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -143,7 +135,6 @@
             "Indicates that a specified resource property has detected errors.  Examples would be drive I/O errors, or network link errors.",
             "The resource property %1 has detected errors of type '%2'.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -157,7 +148,6 @@
             "Indicates that all conditions of a successful remove operation have been met.",
             "The resource has been removed successfully.",
             "OK",
-            "OK",
             0,
             {},
             "None",
@@ -168,7 +158,6 @@
             "Indicates that a self-test has completed.",
             "A self-test has completed.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
@@ -179,7 +168,6 @@
             "Indicates that a self-test has failed.  Suggested resolution may be provided as OEM data.",
             "A self-test has failed.  The following message was returned: '%1'.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -192,7 +180,6 @@
             "Indicates that the health of a resource has changed to Critical.",
             "The health of resource `%1` has changed to %2.",
             "Critical",
-            "Critical",
             2,
             {
                 "string",
@@ -206,7 +193,6 @@
             "Indicates that the health of a resource has changed to OK.",
             "The health of resource '%1' has changed to %2.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -220,7 +206,6 @@
             "Indicates that the health of a resource has changed to Warning.",
             "The health of resource `%1` has changed to %2.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -234,7 +219,6 @@
             "Indicates that an incompatible version of software has been detected.  Examples may be after a component or system level software update.",
             "An incompatible version of software '%1' has been detected.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -247,7 +231,6 @@
             "Indicates that a specified resource property has cleared its warning threshold.  Examples would be drive I/O errors, or network link errors.  Suggested resolution may be provided as OEM data.",
             "The resource property %1 has cleared the warning threshold of value %2.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -261,7 +244,6 @@
             "Indicates that a specified resource property has exceeded its warning threshold.  Examples would be drive I/O errors, or network link errors.  Suggested resolution may be provided as OEM data.",
             "The resource property %1 has exceeded its warning threshold of value %2.",
             "Warning",
-            "Warning",
             2,
             {
                 "string",
@@ -275,7 +257,6 @@
             "Indicates that the URI for a resource has changed.  Examples for this would be physical component replacement or redistribution.",
             "The URI for the resource has changed.",
             "OK",
-            "OK",
             0,
             {},
             "None.",
diff --git a/redfish-core/include/registries/task_event_message_registry.hpp b/redfish-core/include/registries/task_event_message_registry.hpp
index bbc51e7..5e38021 100644
--- a/redfish-core/include/registries/task_event_message_registry.hpp
+++ b/redfish-core/include/registries/task_event_message_registry.hpp
@@ -37,7 +37,6 @@
             "A task has completed with errors.",
             "The task with Id '%1' has completed with errors.",
             "Critical",
-            "Critical",
             1,
             {
                 "string",
@@ -50,7 +49,6 @@
             "A task has been cancelled.",
             "Work on the task with Id '%1' has been halted prior to completion due to an explicit request.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -63,7 +61,6 @@
             "A task has completed.",
             "The task with Id '%1' has completed.",
             "OK",
-            "OK",
             1,
             {
                 "string",
@@ -76,7 +73,6 @@
             "A task has completed with warnings.",
             "The task with Id '%1' has completed with warnings.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -89,7 +85,6 @@
             "A task has been paused.",
             "The task with Id '%1' has been paused.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -102,7 +97,6 @@
             "A task has changed progress.",
             "The task with Id '%1' has changed to progress %2 percent complete.",
             "OK",
-            "OK",
             2,
             {
                 "string",
@@ -116,7 +110,6 @@
             "A task has been removed.",
             "The task with Id '%1' has been removed.",
             "Warning",
-            "Warning",
             1,
             {
                 "string",
@@ -129,7 +122,6 @@
             "A task has been resumed.",
             "The task with Id '%1' has been resumed.",
             "OK",
-            "OK",
             1,
             {
                 "string",
@@ -142,7 +134,6 @@
             "A task has started.",
             "The task with Id '%1' has started.",
             "OK",
-            "OK",
             1,
             {
                 "string",
diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 5a27fe9..629db47 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -1124,7 +1124,7 @@
     if (message != nullptr)
     {
         msg = message->message;
-        severity = message->severity;
+        severity = message->messageSeverity;
     }
 
     // Get the MessageArgs from the log if there are any
@@ -3190,7 +3190,7 @@
         std::string severity;
         if (message != nullptr)
         {
-            severity = message->severity;
+            severity = message->messageSeverity;
         }
 
         // add to AsyncResp
diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp
index c0c6205..c030e5a 100644
--- a/redfish-core/lib/message_registries.hpp
+++ b/redfish-core/lib/message_registries.hpp
@@ -199,7 +199,7 @@
         nlohmann::json& obj = messageObj[message->first];
         obj = {{"Description", message->second.description},
                {"Message", message->second.message},
-               {"Severity", message->second.severity},
+               {"Severity", message->second.messageSeverity},
                {"MessageSeverity", message->second.messageSeverity},
                {"NumberOfArgs", message->second.numberOfArgs},
                {"Resolution", message->second.resolution}};
diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index 8bc8da0..a301307 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -133,7 +133,7 @@
             {"MessageId", std::move(msgId)},
             {"Message", std::move(msg)},
             {"MessageArgs", std::move(jArgs)},
-            {"MessageSeverity", entry.second.severity},
+            {"MessageSeverity", entry.second.messageSeverity},
             {"Resolution", entry.second.resolution}};
 }
 
diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 63dcbca..e0eaa3f 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -109,7 +109,6 @@
                 "        {{\n"
                 "            \"{message[Description]}\",\n"
                 "            \"{message[Message]}\",\n"
-                "            \"{message[Severity]}\",\n"
                 "            \"{message[MessageSeverity]}\",\n"
                 "            {message[NumberOfArgs]},\n"
                 "            {{".format(