diff --git a/src/main/riddl/Product/product.riddl b/src/main/riddl/Product/product.riddl
index 2ebf2a9c..900cf3c1 100644
--- a/src/main/riddl/Product/product.riddl
+++ b/src/main/riddl/Product/product.riddl
@@ -73,17 +73,6 @@ context ProductContext is {
     handler ProductHandler is {
       on command CreateProduct {
         morph entity Product to state DraftProductState with record DraftProduct
-//        (
-//            sku = @CreateProduct.sku,
-//            info = @CreatProduct.info,
-//            meta = !MemberContext.MetaInfo(
-//                createdOn = now(),
-//                createdBy = @CreatProduct.onBehalfOf,
-//                lastUpdatedOn = now(),
-//                lastUpdatedBy = @CreatProduct.onBehalfOf,
-//                currentState = @ProductStates.Draft
-//            )
-//        )
       }
       on other {
         error "Only the CreateProduct command is allowed in the default state."
diff --git a/src/main/riddl/Store/Store.riddl b/src/main/riddl/Store/Store.riddl
index cc0f13af..10a61c6c 100644
--- a/src/main/riddl/Store/Store.riddl
+++ b/src/main/riddl/Store/Store.riddl
@@ -76,29 +76,8 @@ context StoreContext is {
     handler DefaultStoreHandler is {
       on command CreateStore {
         send event StoreCreated
-//        (
-//            storeId = @CreateStore.storeId,
-//            info = @CreateStore.info,
-//            meta = !StoreContext.MetaInfo(
-//                createdOn = now(),
-//                createdBy = @CreateStore.creatingMember,
-//                lastUpdatedOn = now(),
-//                lastUpdatedBy = @CreateStore.creatingMember,
-//                currentState = @CreateStore.Draft
-//            )
-//        )
           to outlet StoreEvents.Events
         morph entity Store to state DraftStore with record DraftStoreState
-//        (
-//          info = @CreateStore.info,
-//          meta = !StoreContext.MetaInfo(
-//            createdOn = now(),
-//            createdBy = @CreateStore.creatingMember,
-//            lastUpdatedOn = now(),
-//            lastUpdatedBy = @CreateStore.creatingMember,
-//            currentState = @StoreStates.Draft
-//          )
-//        )
       }
       on other {
         error "Only the CreateStore command is allowed in the default state"