diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index efb9cad0e..fd11414d0 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="modal-wrapper">
+    <!-- Todo: Put all modals with 2 buttons and equal properties in one customiced 'danger-action-modal' -->
     <disable-modal
       v-if="open === 'disable'"
       :id="data.resource.id"
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 531c4c98c..ace5d9097 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -75,66 +75,28 @@ export default {
   },
   methods: {
     async cancel() {
+      if (!!this.cancelCallback) {
+        await this.cancelCallback()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
-        if (!!this.cancelCallback) {
-          this.cancelCallback()
-        }
       }, 1000)
     },
     async confirm() {
-      var gqlMutation
-
       this.loading = true
       try {
-        switch (this.type) {
-          case 'contribution':
-            // gqlMutation = gql`
-            //   mutation($id: ID!) {
-            //     DeletePost(id: $id) {
-            //       id
-            //     }
-            //   }
-            // `
-            // await this.$apollo.mutate({
-            //   mutation: gqlMutation,
-            //   variables: { id: this.id }
-            // })
-            // this.$toast.success(this.$t(`delete.${this.type}.success`))
-            await this.confirmCallback()
-            break
-          case 'comment':
-            // XXX Make custom mutation and tests in the Backend !!!
-            await this.confirmCallback()
-            break
-        }
+        await this.confirmCallback()
         this.success = true
         setTimeout(() => {
           this.isOpen = false
           setTimeout(() => {
             this.success = false
             this.$emit('close')
-            switch (this.type) {
-              case 'contribution':
-                if (this.$router.history.current.name === 'post-id-slug') {
-                  // redirect to index
-                  // this.$router.history.push('/')
-                } else {
-                  // reload the page (when deleting from profile or index)
-                  // window.location.assign(window.location.href)
-                }
-                break
-            }
           }, 500)
         }, 1500)
       } catch (err) {
         this.success = false
-        // switch (this.type) {
-        //   case 'contribution':
-        //     this.$toast.error(err.message)
-        //     break
-        // }
       } finally {
         this.loading = false
       }
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index b77a4cf12..04a4a95db 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -71,7 +71,6 @@ export default {
       this.$apollo.queries.Post.refetch()
     },
     deleteComment(index) {
-      console.log('Remove comment event !!!')
       this.comments.splice(index, 1)
     }
   },
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index dde3f6ee3..87c1461cf 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -16,7 +16,7 @@ export default {
           variables: { id: this.post.id }
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
-        this.$emit('delete')
+        this.$emit('deletePost')
       } catch (err) {
         this.$toast.error(err.message)
       }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index fa5907213..d3e0feaca 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -10,7 +10,7 @@
         :key="post.id"
         :post="post"
         :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
-        @delete="deletePost(index, post.id)"
+        @deletePost="deletePost(index, post.id)"
       />
     </ds-flex>
     <no-ssr>
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 4fc94e274..b565d5673 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -40,7 +40,7 @@
           :key="relatedPost.id"
           :post="relatedPost"
           :width="{ base: '100%', lg: 1 }"
-          @delete="deletePost(index)"
+          @deletePost="deletePost(index)"
         />
       </ds-flex>
       <hc-empty
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index a034f3a61..d4db41fb5 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -295,7 +295,7 @@
               :key="post.id"
               :post="post"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-              @delete="deletePost(index)"
+              @deletePost="deletePost(index)"
             />
           </template>
           <template v-else>