From b1fc7c3ffe8d17342cae3656a88a6dbf4dec227a Mon Sep 17 00:00:00 2001
From: Johan Degraeve <johan.degraeve@gmail.com>
Date: Tue, 6 Oct 2020 22:34:37 +0200
Subject: [PATCH] deleting older data models as they create warnings

---
 xdrip.xcodeproj/project.pbxproj               |  24 +--
 .../xdrip v10.xcdatamodel/contents            |  94 ----------
 .../xdrip v11.xcdatamodel/contents            | 166 ------------------
 .../xdrip v7.xcdatamodel/contents             |  85 ---------
 .../xdrip v8.xcdatamodel/contents             |  86 ---------
 .../xdrip v9.xcdatamodel/contents             |  93 ----------
 6 files changed, 7 insertions(+), 541 deletions(-)
 delete mode 100644 xdrip/Core Data/xdrip.xcdatamodeld/xdrip v10.xcdatamodel/contents
 delete mode 100644 xdrip/Core Data/xdrip.xcdatamodeld/xdrip v11.xcdatamodel/contents
 delete mode 100644 xdrip/Core Data/xdrip.xcdatamodeld/xdrip v7.xcdatamodel/contents
 delete mode 100644 xdrip/Core Data/xdrip.xcdatamodeld/xdrip v8.xcdatamodel/contents
 delete mode 100644 xdrip/Core Data/xdrip.xcdatamodeld/xdrip v9.xcdatamodel/contents

diff --git a/xdrip.xcodeproj/project.pbxproj b/xdrip.xcodeproj/project.pbxproj
index a5c5801d9..fb187e09a 100644
--- a/xdrip.xcodeproj/project.pbxproj
+++ b/xdrip.xcodeproj/project.pbxproj
@@ -238,6 +238,7 @@
 		F85DC2F421CFE3D400B9F74A /* Sensor+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DC2F121CFE3D400B9F74A /* Sensor+CoreDataClass.swift */; };
 		F85DC2F521CFE3D400B9F74A /* BgReading+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DC2F221CFE3D400B9F74A /* BgReading+CoreDataClass.swift */; };
 		F85FF39125288870004E6FF1 /* HouseKeeper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85FF39025288870004E6FF1 /* HouseKeeper.swift */; };
+		F85FF3C4252D0C32004E6FF1 /* xdrip.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F85FF3C2252D0C32004E6FF1 /* xdrip.xcdatamodeld */; };
 		F867E2612252ADAB000FD265 /* Calibration+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = F867E25D2252ADAB000FD265 /* Calibration+CoreDataProperties.swift */; };
 		F8691888239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8691887239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift */; };
 		F869188C23A044340065B607 /* TextsM5StackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F869188B23A044340065B607 /* TextsM5StackView.swift */; };
@@ -408,7 +409,6 @@
 		F8E53FBD2517F96800052CE5 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E53FBC2517F96800052CE5 /* Date.swift */; };
 		F8E53FCE251D35FB00052CE5 /* Common.strings in Resources */ = {isa = PBXBuildFile; fileRef = F8E53FD0251D35FB00052CE5 /* Common.strings */; };
 		F8E53FE9251F7B8800052CE5 /* Texts.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E53FE8251F7B8800052CE5 /* Texts.swift */; };
-		F8E540462521227000052CE5 /* xdrip.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F8E5403F2521227000052CE5 /* xdrip.xcdatamodeld */; };
 		F8E5404C2522624800052CE5 /* ConstantsHousekeeping.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E5404B2522624800052CE5 /* ConstantsHousekeeping.swift */; };
 		F8E6C78C24CDDB83007C1199 /* SnoozeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C78B24CDDB83007C1199 /* SnoozeViewController.swift */; };
 		F8E6C79024CEC22A007C1199 /* TextsSnooze.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C78F24CEC22A007C1199 /* TextsSnooze.swift */; };
@@ -745,6 +745,7 @@
 		F85DC2F121CFE3D400B9F74A /* Sensor+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Sensor+CoreDataClass.swift"; sourceTree = "<group>"; };
 		F85DC2F221CFE3D400B9F74A /* BgReading+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BgReading+CoreDataClass.swift"; sourceTree = "<group>"; };
 		F85FF39025288870004E6FF1 /* HouseKeeper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HouseKeeper.swift; sourceTree = "<group>"; };
+		F85FF3C3252D0C32004E6FF1 /* xdrip v12.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v12.xcdatamodel"; sourceTree = "<group>"; };
 		F867E25D2252ADAB000FD265 /* Calibration+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Calibration+CoreDataProperties.swift"; path = "xdrip/Core Data/extensions/Calibration+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
 		F8691887239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothPeripheralViewModel.swift; sourceTree = "<group>"; };
 		F869188B23A044340065B607 /* TextsM5StackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextsM5StackView.swift; sourceTree = "<group>"; };
@@ -1013,12 +1014,6 @@
 		F8E53FD6251D363900052CE5 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Common.strings"; sourceTree = "<group>"; };
 		F8E53FD7251D363B00052CE5 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Common.strings; sourceTree = "<group>"; };
 		F8E53FE8251F7B8800052CE5 /* Texts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Texts.swift; sourceTree = "<group>"; };
-		F8E540402521227000052CE5 /* xdrip v8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v8.xcdatamodel"; sourceTree = "<group>"; };
-		F8E540412521227000052CE5 /* xdrip v10.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v10.xcdatamodel"; sourceTree = "<group>"; };
-		F8E540422521227000052CE5 /* xdrip v7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v7.xcdatamodel"; sourceTree = "<group>"; };
-		F8E540432521227000052CE5 /* xdrip v11.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v11.xcdatamodel"; sourceTree = "<group>"; };
-		F8E540442521227000052CE5 /* xdrip v9.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v9.xcdatamodel"; sourceTree = "<group>"; };
-		F8E540452521227000052CE5 /* xdrip v12.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xdrip v12.xcdatamodel"; sourceTree = "<group>"; };
 		F8E5404B2522624800052CE5 /* ConstantsHousekeeping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsHousekeeping.swift; sourceTree = "<group>"; };
 		F8E6C78B24CDDB83007C1199 /* SnoozeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnoozeViewController.swift; sourceTree = "<group>"; };
 		F8E6C78F24CEC22A007C1199 /* TextsSnooze.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextsSnooze.swift; sourceTree = "<group>"; };
@@ -1698,7 +1693,7 @@
 		F8AC42D021B342910078C348 /* Core Data */ = {
 			isa = PBXGroup;
 			children = (
-				F8E5403F2521227000052CE5 /* xdrip.xcdatamodeld */,
+				F85FF3C2252D0C32004E6FF1 /* xdrip.xcdatamodeld */,
 				F8B3A814227DEA69004BA588 /* accessors */,
 				F8EA6CA421B9A25B0082976B /* classes */,
 			);
@@ -2973,6 +2968,7 @@
 				F8F9720423A5915900C3F17D /* TransmitterVersionTxMessage.swift in Sources */,
 				F8DF765C23E350B100063910 /* DexcomG5+BluetoothPeripheral.swift in Sources */,
 				F8F9720323A5915900C3F17D /* CGMG5Transmitter.swift in Sources */,
+				F85FF3C4252D0C32004E6FF1 /* xdrip.xcdatamodeld in Sources */,
 				F8B3A81C227DEC92004BA588 /* AlertEntriesAccessor.swift in Sources */,
 				F8A1585B22EDB7EA007F5B5D /* ConstantsDexcomG5.swift in Sources */,
 				F816E0F524367132009EE65B /* GNSEntry+CoreDataProperties.swift in Sources */,
@@ -3042,7 +3038,6 @@
 				F821CF7B22A1D359005C1E43 /* NightScoutFollowerDelegate.swift in Sources */,
 				F8F9721523A5915900C3F17D /* PairRequestTxMessage.swift in Sources */,
 				F8BECB12235CEA9B0060DAE1 /* TimeInterval.swift in Sources */,
-				F8E540462521227000052CE5 /* xdrip.xcdatamodeld in Sources */,
 				F8F9720823A5915900C3F17D /* BatteryStatusTxMessage.swift in Sources */,
 				F8F9721C23A5915900C3F17D /* LibreOOPResponse.swift in Sources */,
 				F81F9FFC2288C7530028C70F /* NewAlertSettingsViewController.swift in Sources */,
@@ -3693,17 +3688,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
-		F8E5403F2521227000052CE5 /* xdrip.xcdatamodeld */ = {
+		F85FF3C2252D0C32004E6FF1 /* xdrip.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				F8E540402521227000052CE5 /* xdrip v8.xcdatamodel */,
-				F8E540412521227000052CE5 /* xdrip v10.xcdatamodel */,
-				F8E540422521227000052CE5 /* xdrip v7.xcdatamodel */,
-				F8E540432521227000052CE5 /* xdrip v11.xcdatamodel */,
-				F8E540442521227000052CE5 /* xdrip v9.xcdatamodel */,
-				F8E540452521227000052CE5 /* xdrip v12.xcdatamodel */,
+				F85FF3C3252D0C32004E6FF1 /* xdrip v12.xcdatamodel */,
 			);
-			currentVersion = F8E540452521227000052CE5 /* xdrip v12.xcdatamodel */;
+			currentVersion = F85FF3C3252D0C32004E6FF1 /* xdrip v12.xcdatamodel */;
 			path = xdrip.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
diff --git a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v10.xcdatamodel/contents b/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v10.xcdatamodel/contents
deleted file mode 100644
index d43acafc0..000000000
--- a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v10.xcdatamodel/contents	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="AlertEntry" representedClassName=".AlertEntry" syncable="YES">
-        <attribute name="alertkind" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="start" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="value" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="alertType" maxCount="1" deletionRule="No Action" destinationEntity="AlertType" inverseName="alertEntries" inverseEntity="AlertType"/>
-    </entity>
-    <entity name="AlertType" representedClassName=".AlertType" syncable="YES">
-        <attribute name="enabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="overridemute" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snooze" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snoozeperiod" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="soundname" optional="YES" attributeType="String"/>
-        <attribute name="vibrate" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="alertEntries" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AlertEntry" inverseName="alertType" inverseEntity="AlertEntry"/>
-    </entity>
-    <entity name="BgReading" representedClassName=".BgReading" syncable="YES">
-        <attribute name="a" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="ageAdjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="b" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="c" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValueSlope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calibrationFlag" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="filteredCalculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="filteredData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="hideSlope" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="ra" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rawData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rb" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rc" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibration" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Calibration" inverseName="bgreadings" inverseEntity="Calibration"/>
-        <relationship name="sensor" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="readings" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="Calibration" representedClassName=".Calibration" syncable="YES">
-        <attribute name="adjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="bg" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="distanceFromEstimate" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="estimateRawAtTimeOfCalibration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="intercept" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="possibleBad" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rawTimeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="rawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="sensorConfidence" attributeType="Double" usesScalarValueType="YES"/>
-        <attribute name="slope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="slopeConfidence" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="bgreadings" toMany="YES" deletionRule="Deny" destinationEntity="BgReading" inverseName="calibration" inverseEntity="BgReading"/>
-        <relationship name="sensor" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="calibrations" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="M5Stack" representedClassName=".M5Stack" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="backGroundColor" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="blepassword" optional="YES" attributeType="String"/>
-        <attribute name="brightness" optional="YES" attributeType="Integer 16" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="connectToWiFi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="isM5StickC" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="rotation" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="textcolor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-    </entity>
-    <entity name="Sensor" representedClassName=".Sensor" syncable="YES">
-        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="uploadedToNS" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
-        <relationship name="calibrations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Calibration" inverseName="sensor" inverseEntity="Calibration"/>
-        <relationship name="readings" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="BgReading" inverseName="sensor" inverseEntity="BgReading"/>
-    </entity>
-    <entity name="Watlaa" representedClassName=".Watlaa" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-    </entity>
-    <elements>
-        <element name="AlertEntry" positionX="-648" positionY="189" width="128" height="105"/>
-        <element name="AlertType" positionX="-657" positionY="180" width="128" height="165"/>
-        <element name="BgReading" positionX="-285.87109375" positionY="31.9921875" width="128" height="330"/>
-        <element name="Calibration" positionX="-859.21484375" positionY="46.21484375" width="128" height="285"/>
-        <element name="M5Stack" positionX="-657" positionY="180" width="128" height="208"/>
-        <element name="Sensor" positionX="-603.0859375" positionY="482.2890625" width="128" height="133"/>
-        <element name="Watlaa" positionX="-639" positionY="207" width="128" height="103"/>
-    </elements>
-</model>
\ No newline at end of file
diff --git a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v11.xcdatamodel/contents b/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v11.xcdatamodel/contents
deleted file mode 100644
index 1b947f66a..000000000
--- a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v11.xcdatamodel/contents	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="AlertEntry" representedClassName=".AlertEntry" syncable="YES">
-        <attribute name="alertkind" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="start" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="value" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="alertType" maxCount="1" deletionRule="No Action" destinationEntity="AlertType" inverseName="alertEntries" inverseEntity="AlertType"/>
-    </entity>
-    <entity name="AlertType" representedClassName=".AlertType" syncable="YES">
-        <attribute name="enabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="overridemute" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snooze" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snoozeperiod" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="soundname" optional="YES" attributeType="String"/>
-        <attribute name="vibrate" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="alertEntries" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AlertEntry" inverseName="alertType" inverseEntity="AlertEntry"/>
-    </entity>
-    <entity name="BgReading" representedClassName=".BgReading" syncable="YES">
-        <attribute name="a" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="ageAdjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="b" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="c" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValueSlope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calibrationFlag" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="filteredCalculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="filteredData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="hideSlope" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="ra" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rawData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rb" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rc" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibration" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Calibration" inverseName="bgreadings" inverseEntity="Calibration"/>
-        <relationship name="sensor" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="readings" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="BLEPeripheral" representedClassName=".BLEPeripheral" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="lastConnectionStatusChangeTimeStamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="nonFixedSlopeEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="parameterUpdateNeededAtNextConnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="sensorSerialNumber" optional="YES" attributeType="String"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="transmitterId" optional="YES" attributeType="String"/>
-        <attribute name="webOOPEnabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="blucon" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Blucon" inverseName="blePeripheral" inverseEntity="Blucon"/>
-        <relationship name="blueReader" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BlueReader" inverseName="blePeripheral" inverseEntity="BlueReader"/>
-        <relationship name="bubble" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Bubble" inverseName="blePeripheral" inverseEntity="Bubble"/>
-        <relationship name="dexcomG4" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="DexcomG4" inverseName="blePeripheral" inverseEntity="DexcomG4"/>
-        <relationship name="dexcomG5" optional="YES" maxCount="1" deletionRule="Deny" destinationEntity="DexcomG5" inverseName="blePeripheral" inverseEntity="DexcomG5"/>
-        <relationship name="droplet" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Droplet" inverseName="blePeripheral" inverseEntity="Droplet"/>
-        <relationship name="gNSEntry" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GNSEntry" inverseName="blePeripheral" inverseEntity="GNSEntry"/>
-        <relationship name="m5Stack" optional="YES" maxCount="1" deletionRule="Deny" destinationEntity="M5Stack" inverseName="blePeripheral" inverseEntity="M5Stack"/>
-        <relationship name="miaoMiao" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MiaoMiao" inverseName="blePeripheral" inverseEntity="MiaoMiao"/>
-        <relationship name="watlaa" optional="YES" maxCount="1" deletionRule="Deny" destinationEntity="Watlaa" inverseName="blePeripheral" inverseEntity="Watlaa"/>
-    </entity>
-    <entity name="Blucon" representedClassName=".Blucon" syncable="YES">
-        <attribute name="timeStampLastBgReading" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="blucon" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="BlueReader" representedClassName=".BlueReader" syncable="YES">
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="blueReader" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="Bubble" representedClassName=".Bubble" syncable="YES">
-        <attribute name="firmware" optional="YES" attributeType="String"/>
-        <attribute name="hardware" optional="YES" attributeType="String"/>
-        <attribute name="timeStampLastBgReading" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="bubble" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="Calibration" representedClassName=".Calibration" syncable="YES">
-        <attribute name="adjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="bg" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="distanceFromEstimate" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="estimateRawAtTimeOfCalibration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="intercept" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="possibleBad" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rawTimeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="rawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="sensorConfidence" attributeType="Double" usesScalarValueType="YES"/>
-        <attribute name="slope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="slopeConfidence" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="bgreadings" toMany="YES" deletionRule="Deny" destinationEntity="BgReading" inverseName="calibration" inverseEntity="BgReading"/>
-        <relationship name="sensor" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="calibrations" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="DexcomG4" representedClassName=".DexcomG4" syncable="YES">
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="dexcomG4" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="DexcomG5" representedClassName=".DexcomG5" syncable="YES">
-        <attribute name="batteryResist" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="batteryRuntime" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="batteryStatus" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="batteryTemperature" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="firmwareVersion" optional="YES" attributeType="String"/>
-        <attribute name="isDexcomG6" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="lastResetTimeStamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="voltageA" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="voltageB" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="blePeripheral" maxCount="1" deletionRule="Cascade" destinationEntity="BLEPeripheral" inverseName="dexcomG5" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="Droplet" representedClassName=".Droplet" syncable="YES">
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="droplet" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="GNSEntry" representedClassName=".GNSEntry" syncable="YES">
-        <attribute name="bootLoader" optional="YES" attributeType="String"/>
-        <attribute name="firmwareVersion" optional="YES" attributeType="String"/>
-        <attribute name="serialNumber" optional="YES" attributeType="String"/>
-        <attribute name="timeStampLastBgReading" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="gNSEntry" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="M5Stack" representedClassName=".M5Stack" syncable="YES">
-        <attribute name="backGroundColor" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="blepassword" optional="YES" attributeType="String"/>
-        <attribute name="brightness" optional="YES" attributeType="Integer 16" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="connectToWiFi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="isM5StickC" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rotation" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="textcolor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="blePeripheral" maxCount="1" deletionRule="Cascade" destinationEntity="BLEPeripheral" inverseName="m5Stack" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="MiaoMiao" representedClassName=".MiaoMiao" syncable="YES">
-        <attribute name="firmware" optional="YES" attributeType="String"/>
-        <attribute name="hardware" optional="YES" attributeType="String"/>
-        <attribute name="timeStampLastBgReading" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="blePeripheral" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BLEPeripheral" inverseName="miaoMiao" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <entity name="Sensor" representedClassName=".Sensor" syncable="YES">
-        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="uploadedToNS" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
-        <relationship name="calibrations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Calibration" inverseName="sensor" inverseEntity="Calibration"/>
-        <relationship name="readings" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="BgReading" inverseName="sensor" inverseEntity="BgReading"/>
-    </entity>
-    <entity name="Watlaa" representedClassName=".Watlaa" syncable="YES">
-        <attribute name="firmware" optional="YES" attributeType="String"/>
-        <attribute name="hardware" optional="YES" attributeType="String"/>
-        <attribute name="timeStampLastBgReading" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="blePeripheral" maxCount="1" deletionRule="Cascade" destinationEntity="BLEPeripheral" inverseName="watlaa" inverseEntity="BLEPeripheral"/>
-    </entity>
-    <elements>
-        <element name="AlertEntry" positionX="-648" positionY="189" width="128" height="105"/>
-        <element name="AlertType" positionX="-657" positionY="180" width="128" height="165"/>
-        <element name="BgReading" positionX="-285.87109375" positionY="31.9921875" width="128" height="330"/>
-        <element name="BLEPeripheral" positionX="-630" positionY="216" width="128" height="343"/>
-        <element name="Blucon" positionX="-657" positionY="189" width="128" height="73"/>
-        <element name="BlueReader" positionX="-639" positionY="207" width="128" height="58"/>
-        <element name="Bubble" positionX="-657" positionY="189" width="128" height="103"/>
-        <element name="Calibration" positionX="-859.21484375" positionY="46.21484375" width="128" height="285"/>
-        <element name="DexcomG4" positionX="-621" positionY="225" width="128" height="58"/>
-        <element name="DexcomG5" positionX="-648" positionY="198" width="128" height="193"/>
-        <element name="Droplet" positionX="-630" positionY="216" width="128" height="58"/>
-        <element name="GNSEntry" positionX="-648" positionY="198" width="128" height="118"/>
-        <element name="M5Stack" positionX="-657" positionY="180" width="128" height="163"/>
-        <element name="MiaoMiao" positionX="-657" positionY="189" width="128" height="103"/>
-        <element name="Sensor" positionX="-603.0859375" positionY="482.2890625" width="128" height="133"/>
-        <element name="Watlaa" positionX="-639" positionY="207" width="128" height="103"/>
-    </elements>
-</model>
\ No newline at end of file
diff --git a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v7.xcdatamodel/contents b/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v7.xcdatamodel/contents
deleted file mode 100644
index 51021602d..000000000
--- a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v7.xcdatamodel/contents	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="AlertEntry" representedClassName=".AlertEntry" syncable="YES">
-        <attribute name="alertkind" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="start" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="value" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="alertType" maxCount="1" deletionRule="No Action" destinationEntity="AlertType" inverseName="alertEntries" inverseEntity="AlertType"/>
-    </entity>
-    <entity name="AlertType" representedClassName=".AlertType" syncable="YES">
-        <attribute name="enabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="overridemute" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snooze" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snoozeperiod" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="soundname" optional="YES" attributeType="String"/>
-        <attribute name="vibrate" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="alertEntries" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AlertEntry" inverseName="alertType" inverseEntity="AlertEntry"/>
-    </entity>
-    <entity name="BgReading" representedClassName=".BgReading" syncable="YES">
-        <attribute name="a" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="ageAdjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="b" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="c" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValueSlope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calibrationFlag" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="filteredCalculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="filteredData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="hideSlope" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="ra" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rawData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rb" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rc" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibration" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Calibration" inverseName="bgreadings" inverseEntity="Calibration"/>
-        <relationship name="sensor" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="readings" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="Calibration" representedClassName=".Calibration" syncable="YES">
-        <attribute name="adjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="bg" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="distanceFromEstimate" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="estimateRawAtTimeOfCalibration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="intercept" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="possibleBad" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rawTimeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="rawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="sensorConfidence" attributeType="Double" usesScalarValueType="YES"/>
-        <attribute name="slope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="slopeConfidence" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="bgreadings" toMany="YES" deletionRule="Deny" destinationEntity="BgReading" inverseName="calibration" inverseEntity="BgReading"/>
-        <relationship name="sensor" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="calibrations" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="M5Stack" representedClassName=".M5Stack" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="backGroundColor" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="blepassword" optional="YES" attributeType="String"/>
-        <attribute name="brightness" optional="YES" attributeType="Integer 16" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="isM5StickC" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="rotation" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="textcolor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-    </entity>
-    <entity name="Sensor" representedClassName=".Sensor" syncable="YES">
-        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibrations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Calibration" inverseName="sensor" inverseEntity="Calibration"/>
-        <relationship name="readings" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="BgReading" inverseName="sensor" inverseEntity="BgReading"/>
-    </entity>
-    <elements>
-        <element name="AlertEntry" positionX="-648" positionY="189" width="128" height="105"/>
-        <element name="AlertType" positionX="-657" positionY="180" width="128" height="165"/>
-        <element name="BgReading" positionX="-285.87109375" positionY="31.9921875" width="128" height="330"/>
-        <element name="Calibration" positionX="-859.21484375" positionY="46.21484375" width="128" height="285"/>
-        <element name="M5Stack" positionX="-657" positionY="180" width="128" height="193"/>
-        <element name="Sensor" positionX="-603.0859375" positionY="482.2890625" width="128" height="120"/>
-    </elements>
-</model>
\ No newline at end of file
diff --git a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v8.xcdatamodel/contents b/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v8.xcdatamodel/contents
deleted file mode 100644
index b51723e5f..000000000
--- a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v8.xcdatamodel/contents	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="AlertEntry" representedClassName=".AlertEntry" syncable="YES">
-        <attribute name="alertkind" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="start" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="value" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="alertType" maxCount="1" deletionRule="No Action" destinationEntity="AlertType" inverseName="alertEntries" inverseEntity="AlertType"/>
-    </entity>
-    <entity name="AlertType" representedClassName=".AlertType" syncable="YES">
-        <attribute name="enabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="overridemute" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snooze" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snoozeperiod" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="soundname" optional="YES" attributeType="String"/>
-        <attribute name="vibrate" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="alertEntries" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AlertEntry" inverseName="alertType" inverseEntity="AlertEntry"/>
-    </entity>
-    <entity name="BgReading" representedClassName=".BgReading" syncable="YES">
-        <attribute name="a" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="ageAdjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="b" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="c" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValueSlope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calibrationFlag" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="filteredCalculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="filteredData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="hideSlope" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="ra" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rawData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rb" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rc" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibration" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Calibration" inverseName="bgreadings" inverseEntity="Calibration"/>
-        <relationship name="sensor" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="readings" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="Calibration" representedClassName=".Calibration" syncable="YES">
-        <attribute name="adjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="bg" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="distanceFromEstimate" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="estimateRawAtTimeOfCalibration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="intercept" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="possibleBad" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rawTimeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="rawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="sensorConfidence" attributeType="Double" usesScalarValueType="YES"/>
-        <attribute name="slope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="slopeConfidence" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="bgreadings" toMany="YES" deletionRule="Deny" destinationEntity="BgReading" inverseName="calibration" inverseEntity="BgReading"/>
-        <relationship name="sensor" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="calibrations" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="M5Stack" representedClassName=".M5Stack" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="backGroundColor" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="blepassword" optional="YES" attributeType="String"/>
-        <attribute name="brightness" optional="YES" attributeType="Integer 16" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="connectToWiFi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="isM5StickC" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="rotation" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="textcolor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-    </entity>
-    <entity name="Sensor" representedClassName=".Sensor" syncable="YES">
-        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibrations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Calibration" inverseName="sensor" inverseEntity="Calibration"/>
-        <relationship name="readings" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="BgReading" inverseName="sensor" inverseEntity="BgReading"/>
-    </entity>
-    <elements>
-        <element name="AlertEntry" positionX="-648" positionY="189" width="128" height="105"/>
-        <element name="AlertType" positionX="-657" positionY="180" width="128" height="165"/>
-        <element name="BgReading" positionX="-285.87109375" positionY="31.9921875" width="128" height="330"/>
-        <element name="Calibration" positionX="-859.21484375" positionY="46.21484375" width="128" height="285"/>
-        <element name="M5Stack" positionX="-657" positionY="180" width="128" height="208"/>
-        <element name="Sensor" positionX="-603.0859375" positionY="482.2890625" width="128" height="120"/>
-    </elements>
-</model>
\ No newline at end of file
diff --git a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v9.xcdatamodel/contents b/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v9.xcdatamodel/contents
deleted file mode 100644
index 730a05724..000000000
--- a/xdrip/Core Data/xdrip.xcdatamodeld/xdrip v9.xcdatamodel/contents	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="AlertEntry" representedClassName=".AlertEntry" syncable="YES">
-        <attribute name="alertkind" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="start" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="value" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <relationship name="alertType" maxCount="1" deletionRule="No Action" destinationEntity="AlertType" inverseName="alertEntries" inverseEntity="AlertType"/>
-    </entity>
-    <entity name="AlertType" representedClassName=".AlertType" syncable="YES">
-        <attribute name="enabled" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="overridemute" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snooze" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="snoozeperiod" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="soundname" optional="YES" attributeType="String"/>
-        <attribute name="vibrate" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="alertEntries" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AlertEntry" inverseName="alertType" inverseEntity="AlertEntry"/>
-    </entity>
-    <entity name="BgReading" representedClassName=".BgReading" syncable="YES">
-        <attribute name="a" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="ageAdjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="b" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="c" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calculatedValueSlope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="calibrationFlag" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="filteredCalculatedValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="filteredData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="hideSlope" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="ra" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rawData" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rb" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="rc" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibration" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Calibration" inverseName="bgreadings" inverseEntity="Calibration"/>
-        <relationship name="sensor" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="readings" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="Calibration" representedClassName=".Calibration" syncable="YES">
-        <attribute name="adjustedRawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="bg" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="deviceName" optional="YES" attributeType="String"/>
-        <attribute name="distanceFromEstimate" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="estimateRawAtTimeOfCalibration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="intercept" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="possibleBad" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="rawTimeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="rawValue" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="sensorConfidence" attributeType="Double" usesScalarValueType="YES"/>
-        <attribute name="slope" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="slopeConfidence" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="timeStamp" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="bgreadings" toMany="YES" deletionRule="Deny" destinationEntity="BgReading" inverseName="calibration" inverseEntity="BgReading"/>
-        <relationship name="sensor" maxCount="1" deletionRule="Nullify" destinationEntity="Sensor" inverseName="calibrations" inverseEntity="Sensor"/>
-    </entity>
-    <entity name="M5Stack" representedClassName=".M5Stack" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="backGroundColor" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="blepassword" optional="YES" attributeType="String"/>
-        <attribute name="brightness" optional="YES" attributeType="Integer 16" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="connectToWiFi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="isM5StickC" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="rotation" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="textcolor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
-    </entity>
-    <entity name="Sensor" representedClassName=".Sensor" syncable="YES">
-        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="id" attributeType="String"/>
-        <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="calibrations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Calibration" inverseName="sensor" inverseEntity="Calibration"/>
-        <relationship name="readings" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="BgReading" inverseName="sensor" inverseEntity="BgReading"/>
-    </entity>
-    <entity name="Watlaa" representedClassName=".Watlaa" syncable="YES">
-        <attribute name="address" attributeType="String"/>
-        <attribute name="alias" optional="YES" attributeType="String"/>
-        <attribute name="name" attributeType="String"/>
-        <attribute name="shouldconnect" attributeType="Boolean" usesScalarValueType="YES"/>
-    </entity>
-    <elements>
-        <element name="AlertEntry" positionX="-648" positionY="189" width="128" height="105"/>
-        <element name="AlertType" positionX="-657" positionY="180" width="128" height="165"/>
-        <element name="BgReading" positionX="-285.87109375" positionY="31.9921875" width="128" height="330"/>
-        <element name="Calibration" positionX="-859.21484375" positionY="46.21484375" width="128" height="285"/>
-        <element name="M5Stack" positionX="-657" positionY="180" width="128" height="208"/>
-        <element name="Sensor" positionX="-603.0859375" positionY="482.2890625" width="128" height="120"/>
-        <element name="Watlaa" positionX="-639" positionY="207" width="128" height="103"/>
-    </elements>
-</model>
\ No newline at end of file