diff --git a/fiori/app/fiori.html b/fiori/app/fiori.html
index 26182c12..aec60a55 100644
--- a/fiori/app/fiori.html
+++ b/fiori/app/fiori.html
@@ -40,7 +40,8 @@
 	</script>
 
 	<script src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
+	<script src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
     	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
     	data-sap-ui-compatVersion="edge"
     	data-sap-ui-theme="sap_fiori_3"
diff --git a/orders/db/schema.cds b/orders/db/schema.cds
index f72f737a..048aba28 100644
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -14,7 +14,3 @@ entity OrderItems : cuid {
   amount    : Integer;
   netAmount : Decimal(9,2);
 }
-
-// Have IDs auto-computed.  TODO revisit w/ Fiori how long this is needed
-// see https://answers.sap.com/questions/13091274/sample-fiori-app-creating-a-new-order-shows-a-popu.html
-annotate cuid with { ID @Core.Computed; }