diff --git a/iothub/service/src/Common/Exceptions/ErrorCode.cs b/iothub/service/src/Common/Exceptions/ErrorCode.cs
index 42a758865f..37ecd65ab6 100644
--- a/iothub/service/src/Common/Exceptions/ErrorCode.cs
+++ b/iothub/service/src/Common/Exceptions/ErrorCode.cs
@@ -230,6 +230,8 @@ public enum ErrorCode
         /// the message is locked by IoT hub for a lock timeout duration of one minute.
         /// If the device tries to complete the message after the lock timeout expires, IoT hub throws this exception.
         /// </summary>
+        [Obsolete("This error should not be returned to a service application. This is relevant only for a device application.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         DeviceMessageLockLost = 412002,
 
         // RequestEntityTooLarge - 413
diff --git a/iothub/service/src/Common/TrackingHelper.cs b/iothub/service/src/Common/TrackingHelper.cs
index cbc4e77d4b..e6f6c5f875 100644
--- a/iothub/service/src/Common/TrackingHelper.cs
+++ b/iothub/service/src/Common/TrackingHelper.cs
@@ -220,10 +220,6 @@ public static ErrorCode GetErrorCodeFromAmqpError(Error ex)
             {
                 return ErrorCode.DeviceNotFound;
             }
-            if (ex.Condition.Equals(IotHubAmqpErrorCode.MessageLockLostError))
-            {
-                return ErrorCode.DeviceMessageLockLost;
-            }
             if (ex.Condition.Equals(IotHubAmqpErrorCode.IotHubSuspended))
             {
                 return ErrorCode.IotHubSuspended;
diff --git a/iothub/service/src/JobStatus.cs b/iothub/service/src/JobStatus.cs
index aacc7140e5..11a46cbd6b 100644
--- a/iothub/service/src/JobStatus.cs
+++ b/iothub/service/src/JobStatus.cs
@@ -56,7 +56,7 @@ public enum JobStatus
         Scheduled,
 
         /// <summary>
-        /// Indicates that a Job is in the queue for execution (synonym for enqueued to be depricated)
+        /// Indicates that a Job is in the queue for execution (synonym for enqueued to be deprecated)
         /// </summary>
         [EnumMember(Value = "queued")]
         Queued