diff --git a/fiori/app/admin/webapp/Component.js b/fiori/app/admin/webapp/Component.js
index 9fdf2d05..18967b84 100644
--- a/fiori/app/admin/webapp/Component.js
+++ b/fiori/app/admin/webapp/Component.js
@@ -1,22 +1,5 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("admin.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
     metadata:{ manifest:'json' }
 }))
 
-// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-
-// jQuery.sap.declare("bookshop.Component");
-// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
-// jQuery.sap.require("sap.ui.generic.app.AppComponent");
-
-// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
-// 	metadata: {
-// 		manifest: "json"
-// 	}
-// });
-
 /* eslint no-undef:0 */
\ No newline at end of file
diff --git a/fiori/app/browse/webapp/Component.js b/fiori/app/browse/webapp/Component.js
index e46ce759..0d8d14b5 100644
--- a/fiori/app/browse/webapp/Component.js
+++ b/fiori/app/browse/webapp/Component.js
@@ -1,22 +1,5 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("bookshop.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
     metadata:{ manifest:'json' }
 }))
 
-// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-
-// jQuery.sap.declare("bookshop.Component");
-// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
-// jQuery.sap.require("sap.ui.generic.app.AppComponent");
-
-// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
-// 	metadata: {
-// 		manifest: "json"
-// 	}
-// });
-
 /* eslint no-undef:0 */
\ No newline at end of file
diff --git a/fiori/app/orders/webapp/Component.js b/fiori/app/orders/webapp/Component.js
index e40eb3be..82388965 100644
--- a/fiori/app/orders/webapp/Component.js
+++ b/fiori/app/orders/webapp/Component.js
@@ -1,22 +1,5 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("orders.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("orders.Component", {
     metadata:{ manifest:'json' }
 }))
 
-// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
-//     metadata: { manifest: "json" }
-// }))
-
-// jQuery.sap.declare("bookshop.Component");
-// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
-// jQuery.sap.require("sap.ui.generic.app.AppComponent");
-
-// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
-// 	metadata: {
-// 		manifest: "json"
-// 	}
-// });
-
 /* eslint no-undef:0 */
\ No newline at end of file