diff --git a/ClosedXML/Excel/Ranges/XLRangeFactory.cs b/ClosedXML/Excel/Ranges/XLRangeFactory.cs
index 6c88d26..b3ded64 100644
--- a/ClosedXML/Excel/Ranges/XLRangeFactory.cs
+++ b/ClosedXML/Excel/Ranges/XLRangeFactory.cs
@@ -46,10 +46,8 @@
                     return CreateTable(key.RangeAddress);
 
                 case XLRangeType.Worksheet:
-                //break;
                 default:
                     throw new NotImplementedException(key.RangeType.ToString());
-                    break;
             }
         }
 
diff --git a/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/Excel/XLWorkbook_Load.cs
index 962c37e..fae473b 100644
--- a/ClosedXML/Excel/XLWorkbook_Load.cs
+++ b/ClosedXML/Excel/XLWorkbook_Load.cs
@@ -1433,7 +1433,9 @@
 
                 if (cell.CellValue != null)
                 {
+#pragma warning disable 618
                     xlCell.ValueCached = cell.CellValue.Text;
+#pragma warning restore 618
                     xlCell.SetInternalCellValueString(cell.CellValue.Text);
                 }
             }
@@ -1489,7 +1491,9 @@
 
                 if (cell.CellValue != null)
                 {
+#pragma warning disable 618
                     xlCell.ValueCached = cell.CellValue.Text;
+#pragma warning restore 618
                     xlCell.SetInternalCellValueString(cell.CellValue.Text);
                 }
             }