diff --git a/backend/.env.template b/backend/.env.template
index abc62b2dc..e905d1eb6 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -4,7 +4,7 @@ NEO4J_PASSWORD=letmein
 GRAPHQL_PORT=4000
 GRAPHQL_URI=http://localhost:4000
 CLIENT_URI=http://localhost:3000
-MOCK=false
+MOCKS=false
 
 JWT_SECRET="b/&&7b78BF&fv/Vd"
 MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ"
diff --git a/backend/package.json b/backend/package.json
index e2abde493..d861f9b6c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,7 +11,7 @@
     "lint": "eslint src --config .eslintrc.js",
     "test": "run-s test:jest test:cucumber",
     "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev 2> /dev/null",
-    "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev 2> /dev/null",
+    "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DEBUG=true DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev 2> /dev/null",
     "test:jest:cmd": "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand",
     "test:cucumber:cmd": "wait-on tcp:4001 tcp:4123 && cucumber-js --require-module @babel/register --exit test/",
     "test:jest:cmd:debug": "wait-on tcp:4001 tcp:4123 && node --inspect-brk ./node_modules/.bin/jest -i --forceExit --detectOpenHandles --runInBand",
@@ -19,8 +19,8 @@
     "test:cucumber": " cross-env CLIENT_URI=http://localhost:4123 run-p --race test:before:* 'test:cucumber:cmd {@}' --",
     "test:jest:debug": "run-p --race test:before:* 'test:jest:cmd:debug {@}' --",
     "db:script:seed": "wait-on tcp:4001 && babel-node src/seed/seed-db.js",
-    "db:reset": "babel-node src/seed/reset-db.js",
-    "db:seed": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions run-p --race dev db:script:seed"
+    "db:reset": "cross-env DEBUG=true babel-node src/seed/reset-db.js",
+    "db:seed": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DEBUG=true DISABLED_MIDDLEWARES=permissions run-p --race dev db:script:seed"
   },
   "author": "Human Connection gGmbH",
   "license": "MIT",
@@ -109,4 +109,4 @@
     "prettier": "~1.17.1",
     "supertest": "~4.0.2"
   }
-}
+}
\ No newline at end of file
diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js
index da1056362..12671f330 100644
--- a/backend/src/activitypub/ActivityPub.js
+++ b/backend/src/activitypub/ActivityPub.js
@@ -4,9 +4,9 @@ import request from 'request'
 import as from 'activitystrea.ms'
 import NitroDataSource from './NitroDataSource'
 import router from './routes'
-import dotenv from 'dotenv'
 import Collections from './Collections'
 import uuid from 'uuid/v4'
+import CONFIG from '../config'
 const debug = require('debug')('ea')
 
 let activityPub = null
@@ -22,11 +22,7 @@ export default class ActivityPub {
 
   static init(server) {
     if (!activityPub) {
-      dotenv.config()
-      activityPub = new ActivityPub(
-        process.env.CLIENT_URI || 'http://localhost:3000',
-        process.env.GRAPHQL_URI || 'http://localhost:4000',
-      )
+      activityPub = new ActivityPub(CONFIG.CLIENT_URI, CONFIG.GRAPHQL_URI)
 
       // integrate into running graphql express server
       server.express.set('ap', activityPub)
diff --git a/backend/src/activitypub/security/index.js b/backend/src/activitypub/security/index.js
index 7f619acbe..9b48b7ed9 100644
--- a/backend/src/activitypub/security/index.js
+++ b/backend/src/activitypub/security/index.js
@@ -1,13 +1,15 @@
-import dotenv from 'dotenv'
-import { resolve } from 'path'
+// import dotenv from 'dotenv'
+// import { resolve } from 'path'
 import crypto from 'crypto'
 import request from 'request'
+import CONFIG from './../../config'
 const debug = require('debug')('ea:security')
 
-dotenv.config({ path: resolve('src', 'activitypub', '.env') })
+// TODO Does this reference a local config? Why?
+// dotenv.config({ path: resolve('src', 'activitypub', '.env') })
 
 export function generateRsaKeyPair(options = {}) {
-  const { passphrase = process.env.PRIVATE_KEY_PASSPHRASE } = options
+  const { passphrase = CONFIG.PRIVATE_KEY_PASSPHRASE } = options
   return crypto.generateKeyPairSync('rsa', {
     modulusLength: 4096,
     publicKeyEncoding: {
@@ -31,7 +33,7 @@ export function createSignature(options) {
     url,
     headers = {},
     algorithm = 'rsa-sha256',
-    passphrase = process.env.PRIVATE_KEY_PASSPHRASE,
+    passphrase = CONFIG.PRIVATE_KEY_PASSPHRASE,
   } = options
   if (!SUPPORTED_HASH_ALGORITHMS.includes(algorithm)) {
     throw Error(`SIGNING: Unsupported hashing algorithm = ${algorithm}`)
diff --git a/backend/src/activitypub/utils/index.js b/backend/src/activitypub/utils/index.js
index ee7ae2606..3927f4056 100644
--- a/backend/src/activitypub/utils/index.js
+++ b/backend/src/activitypub/utils/index.js
@@ -2,6 +2,7 @@ import { activityPub } from '../ActivityPub'
 import gql from 'graphql-tag'
 import { createSignature } from '../security'
 import request from 'request'
+import CONFIG from './../../config'
 const debug = require('debug')('ea:utils')
 
 export function extractNameFromId(uri) {
@@ -38,7 +39,7 @@ export function throwErrorIfApolloErrorOccurred(result) {
 export function signAndSend(activity, fromName, targetDomain, url) {
   // fix for development: replace with http
   url = url.indexOf('localhost') > -1 ? url.replace('https', 'http') : url
-  debug(`passhprase = ${process.env.PRIVATE_KEY_PASSPHRASE}`)
+  debug(`passhprase = ${CONFIG.PRIVATE_KEY_PASSPHRASE}`)
   return new Promise(async (resolve, reject) => {
     debug('inside signAndSend')
     // get the private key
diff --git a/backend/src/bootstrap/neo4j.js b/backend/src/bootstrap/neo4j.js
index 292983359..bfa68acf3 100644
--- a/backend/src/bootstrap/neo4j.js
+++ b/backend/src/bootstrap/neo4j.js
@@ -1,15 +1,13 @@
 import { v1 as neo4j } from 'neo4j-driver'
-import dotenv from 'dotenv'
-
-dotenv.config()
+import CONFIG from './../config'
 
 let driver
 
 export function getDriver(options = {}) {
   const {
-    uri = process.env.NEO4J_URI || 'bolt://localhost:7687',
-    username = process.env.NEO4J_USERNAME || 'neo4j',
-    password = process.env.NEO4J_PASSWORD || 'neo4j',
+    uri = CONFIG.NEO4J_URI,
+    username = CONFIG.NEO4J_USERNAME,
+    password = CONFIG.NEO4J_PASSWORD,
   } = options
   if (!driver) {
     driver = neo4j.driver(uri, neo4j.auth.basic(username, password))
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
new file mode 100644
index 000000000..5cc455495
--- /dev/null
+++ b/backend/src/config/index.js
@@ -0,0 +1,34 @@
+import dotenv from 'dotenv'
+
+dotenv.config()
+
+export const requiredConfigs = {
+  MAPBOX_TOKEN: process.env.MAPBOX_TOKEN,
+  JWT_SECRET: process.env.JWT_SECRET,
+  PRIVATE_KEY_PASSPHRASE: process.env.PRIVATE_KEY_PASSPHRASE,
+}
+
+export const neo4jConfigs = {
+  NEO4J_URI: process.env.NEO4J_URI || 'bolt://localhost:7687',
+  NEO4J_USERNAME: process.env.NEO4J_USERNAME || 'neo4j',
+  NEO4J_PASSWORD: process.env.NEO4J_PASSWORD || 'neo4j',
+}
+
+export const serverConfigs = {
+  GRAPHQL_PORT: process.env.GRAPHQL_PORT || 4000,
+  CLIENT_URI: process.env.CLIENT_URI || 'http://localhost:3000',
+  GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000',
+}
+
+export const developmentConfigs = {
+  DEBUG: process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'true',
+  MOCKS: process.env.MOCKS === 'true',
+  DISABLED_MIDDLEWARES: process.env.DISABLED_MIDDLEWARES || '',
+}
+
+export default {
+  ...requiredConfigs,
+  ...neo4jConfigs,
+  ...serverConfigs,
+  ...developmentConfigs,
+}
diff --git a/backend/src/graphql-schema.js b/backend/src/graphql-schema.js
deleted file mode 100644
index 01b40dfc5..000000000
--- a/backend/src/graphql-schema.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as typeDefs } from './types'
-export { default as resolvers } from './resolvers'
diff --git a/backend/src/index.js b/backend/src/index.js
index 2095d171f..f28e58947 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -1,17 +1,18 @@
 import createServer from './server'
 import ActivityPub from './activitypub/ActivityPub'
+import CONFIG from './config'
 
 const serverConfig = {
-  port: process.env.GRAPHQL_PORT || 4000,
+  port: CONFIG.GRAPHQL_PORT,
   // cors: {
   //   credentials: true,
-  //   origin: [process.env.CLIENT_URI] // your frontend url.
+  //   origin: [CONFIG.CLIENT_URI] // your frontend url.
   // }
 }
 
 const server = createServer()
 server.start(serverConfig, options => {
   /* eslint-disable-next-line no-console */
-  console.log(`GraphQLServer ready at ${process.env.GRAPHQL_URI} 🚀`)
+  console.log(`GraphQLServer ready at ${CONFIG.GRAPHQL_URI} 🚀`)
   ActivityPub.init(server)
 })
diff --git a/backend/src/jwt/decode.js b/backend/src/jwt/decode.js
index d4485952d..b98357103 100644
--- a/backend/src/jwt/decode.js
+++ b/backend/src/jwt/decode.js
@@ -1,11 +1,12 @@
 import jwt from 'jsonwebtoken'
+import CONFIG from './../config'
 
 export default async (driver, authorizationHeader) => {
   if (!authorizationHeader) return null
   const token = authorizationHeader.replace('Bearer ', '')
   let id = null
   try {
-    const decoded = await jwt.verify(token, process.env.JWT_SECRET)
+    const decoded = await jwt.verify(token, CONFIG.JWT_SECRET)
     id = decoded.sub
   } catch (err) {
     return null
diff --git a/backend/src/jwt/encode.js b/backend/src/jwt/encode.js
index 49aa17bd0..97c6dcd66 100644
--- a/backend/src/jwt/encode.js
+++ b/backend/src/jwt/encode.js
@@ -1,15 +1,16 @@
 import jwt from 'jsonwebtoken'
 import ms from 'ms'
+import CONFIG from './../config'
 
 // Generate an Access Token for the given User ID
 export default function encode(user) {
-  const token = jwt.sign(user, process.env.JWT_SECRET, {
+  const token = jwt.sign(user, CONFIG.JWT_SECRET, {
     expiresIn: ms('1d'),
-    issuer: process.env.GRAPHQL_URI,
-    audience: process.env.CLIENT_URI,
+    issuer: CONFIG.GRAPHQL_URI,
+    audience: CONFIG.CLIENT_URI,
     subject: user.id.toString(),
   })
-  // jwt.verifySignature(token, process.env.JWT_SECRET, (err, data) => {
+  // jwt.verifySignature(token, CONFIG.JWT_SECRET, (err, data) => {
   //   console.log('token verification:', err, data)
   // })
   return token
diff --git a/backend/src/middleware/activityPubMiddleware.js b/backend/src/middleware/activityPubMiddleware.js
index 43da21e26..f3ced42f9 100644
--- a/backend/src/middleware/activityPubMiddleware.js
+++ b/backend/src/middleware/activityPubMiddleware.js
@@ -1,10 +1,8 @@
 import { generateRsaKeyPair } from '../activitypub/security'
 import { activityPub } from '../activitypub/ActivityPub'
 import as from 'activitystrea.ms'
-import dotenv from 'dotenv'
 
 const debug = require('debug')('backend:schema')
-dotenv.config()
 
 export default {
   Mutation: {
diff --git a/backend/src/middleware/index.js b/backend/src/middleware/index.js
index bef6ceac9..754c59bbb 100644
--- a/backend/src/middleware/index.js
+++ b/backend/src/middleware/index.js
@@ -1,42 +1,63 @@
-import activityPubMiddleware from './activityPubMiddleware'
-import passwordMiddleware from './passwordMiddleware'
-import softDeleteMiddleware from './softDeleteMiddleware'
-import sluggifyMiddleware from './sluggifyMiddleware'
-import fixImageUrlsMiddleware from './fixImageUrlsMiddleware'
-import excerptMiddleware from './excerptMiddleware'
-import dateTimeMiddleware from './dateTimeMiddleware'
-import xssMiddleware from './xssMiddleware'
-import permissionsMiddleware from './permissionsMiddleware'
-import userMiddleware from './userMiddleware'
-import includedFieldsMiddleware from './includedFieldsMiddleware'
-import orderByMiddleware from './orderByMiddleware'
-import validationMiddleware from './validation'
-import notificationsMiddleware from './notifications'
+import CONFIG from './../config'
+import activityPub from './activityPubMiddleware'
+import password from './passwordMiddleware'
+import softDelete from './softDeleteMiddleware'
+import sluggify from './sluggifyMiddleware'
+import fixImageUrls from './fixImageUrlsMiddleware'
+import excerpt from './excerptMiddleware'
+import dateTime from './dateTimeMiddleware'
+import xss from './xssMiddleware'
+import permissions from './permissionsMiddleware'
+import user from './userMiddleware'
+import includedFields from './includedFieldsMiddleware'
+import orderBy from './orderByMiddleware'
+import validation from './validation'
+import notifications from './notifications'
 
 export default schema => {
-  let middleware = [
-    passwordMiddleware,
-    dateTimeMiddleware,
-    validationMiddleware,
-    sluggifyMiddleware,
-    excerptMiddleware,
-    notificationsMiddleware,
-    xssMiddleware,
-    fixImageUrlsMiddleware,
-    softDeleteMiddleware,
-    userMiddleware,
-    includedFieldsMiddleware,
-    orderByMiddleware,
+  const middlewares = {
+    permissions: permissions,
+    activityPub: activityPub,
+    password: password,
+    dateTime: dateTime,
+    validation: validation,
+    sluggify: sluggify,
+    excerpt: excerpt,
+    notifications: notifications,
+    xss: xss,
+    fixImageUrls: fixImageUrls,
+    softDelete: softDelete,
+    user: user,
+    includedFields: includedFields,
+    orderBy: orderBy,
+  }
+
+  let order = [
+    'permissions',
+    'activityPub',
+    'password',
+    'dateTime',
+    'validation',
+    'sluggify',
+    'excerpt',
+    'notifications',
+    'xss',
+    'fixImageUrls',
+    'softDelete',
+    'user',
+    'includedFields',
+    'orderBy',
   ]
 
   // add permisions middleware at the first position (unless we're seeding)
-  // NOTE: DO NOT SET THE PERMISSION FLAT YOUR SELF
-  if (process.env.NODE_ENV !== 'production') {
-    const DISABLED_MIDDLEWARES = process.env.DISABLED_MIDDLEWARES || ''
-    const disabled = DISABLED_MIDDLEWARES.split(',')
-    if (!disabled.includes('activityPub')) middleware.unshift(activityPubMiddleware)
-    if (!disabled.includes('permissions'))
-      middleware.unshift(permissionsMiddleware.generate(schema))
+  if (CONFIG.DEBUG) {
+    const disabledMiddlewares = CONFIG.DISABLED_MIDDLEWARES.split(',')
+    order = order.filter(key => {
+      return !disabledMiddlewares.includes(key)
+    })
+    /* eslint-disable-next-line no-console */
+    console.log(`Warning: "${disabledMiddlewares}" middlewares have been disabled.`)
   }
-  return middleware
+
+  return order.map(key => middlewares[key])
 }
diff --git a/backend/src/middleware/nodes/locations.js b/backend/src/middleware/nodes/locations.js
index a0adeb57f..62d1e3a65 100644
--- a/backend/src/middleware/nodes/locations.js
+++ b/backend/src/middleware/nodes/locations.js
@@ -2,6 +2,7 @@ import request from 'request'
 import { UserInputError } from 'apollo-server'
 import isEmpty from 'lodash/isEmpty'
 import asyncForEach from '../../helpers/asyncForEach'
+import CONFIG from './../../config'
 
 const fetch = url => {
   return new Promise((resolve, reject) => {
@@ -58,11 +59,12 @@ const createOrUpdateLocations = async (userId, locationName, driver) => {
   if (isEmpty(locationName)) {
     return
   }
-  const mapboxToken = process.env.MAPBOX_TOKEN
   const res = await fetch(
     `https://api.mapbox.com/geocoding/v5/mapbox.places/${encodeURIComponent(
       locationName,
-    )}.json?access_token=${mapboxToken}&types=region,place,country&language=${locales.join(',')}`,
+    )}.json?access_token=${CONFIG.MAPBOX_TOKEN}&types=region,place,country&language=${locales.join(
+      ',',
+    )}`,
   )
 
   if (!res || !res.features || !res.features[0]) {
diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js
index 658447160..450220cd6 100644
--- a/backend/src/middleware/orderByMiddleware.spec.js
+++ b/backend/src/middleware/orderByMiddleware.spec.js
@@ -1,6 +1,6 @@
+import { GraphQLClient } from 'graphql-request'
 import Factory from '../seed/factories'
 import { host } from '../jest/helpers'
-import { GraphQLClient } from 'graphql-request'
 
 let client
 let headers
diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index b1a08a14d..bc9b4c525 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -16,11 +16,15 @@ const isAdmin = rule()(async (parent, args, { user }, info) => {
   return user && user.role === 'admin'
 })
 
-const isMyOwn = rule({ cache: 'no_cache' })(async (parent, args, context, info) => {
+const isMyOwn = rule({
+  cache: 'no_cache',
+})(async (parent, args, context, info) => {
   return context.user.id === parent.id
 })
 
-const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
+const belongsToMe = rule({
+  cache: 'no_cache',
+})(async (_, args, context) => {
   const {
     driver,
     user: { id: userId },
@@ -32,7 +36,10 @@ const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
   MATCH (u:User {id: $userId})<-[:NOTIFIED]-(n:Notification {id: $notificationId})
   RETURN n
   `,
-    { userId, notificationId },
+    {
+      userId,
+      notificationId,
+    },
   )
   const [notification] = result.records.map(record => {
     return record.get('n')
@@ -41,21 +48,27 @@ const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
   return Boolean(notification)
 })
 
-const onlyEnabledContent = rule({ cache: 'strict' })(async (parent, args, ctx, info) => {
+const onlyEnabledContent = rule({
+  cache: 'strict',
+})(async (parent, args, ctx, info) => {
   const { disabled, deleted } = args
   return !(disabled || deleted)
 })
 
-const isAuthor = rule({ cache: 'no_cache' })(async (parent, args, { user, driver }) => {
+const isAuthor = rule({
+  cache: 'no_cache',
+})(async (parent, args, { user, driver }) => {
   if (!user) return false
   const session = driver.session()
-  const { id: postId } = args
+  const { id: resourceId } = args
   const result = await session.run(
     `
-  MATCH (post:Post {id: $postId})<-[:WROTE]-(author)
+  MATCH (resource {id: $resourceId})<-[:WROTE]-(author)
   RETURN author
   `,
-    { postId },
+    {
+      resourceId,
+    },
   )
   const [author] = result.records.map(record => {
     return record.get('author')
@@ -100,6 +113,7 @@ const permissions = shield({
     enable: isModerator,
     disable: isModerator,
     CreateComment: isAuthenticated,
+    DeleteComment: isAuthor,
     // CreateUser: allow,
   },
   User: {
diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index fc1815631..6cf9dc302 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -1,6 +1,6 @@
+import { GraphQLClient } from 'graphql-request'
 import Factory from '../seed/factories'
 import { host, login } from '../jest/helpers'
-import { GraphQLClient } from 'graphql-request'
 
 const factory = Factory()
 
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index 7ca4ec193..79bba0a5d 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -1,6 +1,6 @@
+import { GraphQLClient } from 'graphql-request'
 import Factory from '../seed/factories'
 import { host, login } from '../jest/helpers'
-import { GraphQLClient } from 'graphql-request'
 
 let authenticatedClient
 let headers
diff --git a/backend/src/middleware/softDeleteMiddleware.spec.js b/backend/src/middleware/softDeleteMiddleware.spec.js
index 4265599dd..388f44a3c 100644
--- a/backend/src/middleware/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDeleteMiddleware.spec.js
@@ -1,6 +1,6 @@
+import { GraphQLClient } from 'graphql-request'
 import Factory from '../seed/factories'
 import { host, login } from '../jest/helpers'
-import { GraphQLClient } from 'graphql-request'
 
 const factory = Factory()
 let client
diff --git a/backend/src/middleware/userMiddleware.js b/backend/src/middleware/userMiddleware.js
index 079ba310a..29e512ebd 100644
--- a/backend/src/middleware/userMiddleware.js
+++ b/backend/src/middleware/userMiddleware.js
@@ -1,9 +1,5 @@
-import dotenv from 'dotenv'
-
 import createOrUpdateLocations from './nodes/locations'
 
-dotenv.config()
-
 export default {
   Mutation: {
     CreateUser: async (resolve, root, args, context, info) => {
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
new file mode 100644
index 000000000..d294d8aba
--- /dev/null
+++ b/backend/src/schema/index.js
@@ -0,0 +1,24 @@
+import { makeAugmentedSchema } from 'neo4j-graphql-js'
+import CONFIG from './../config'
+import applyScalars from './../bootstrap/scalars'
+import applyDirectives from './../bootstrap/directives'
+import typeDefs from './types'
+import resolvers from './resolvers'
+
+export default applyScalars(
+  applyDirectives(
+    makeAugmentedSchema({
+      typeDefs,
+      resolvers,
+      config: {
+        query: {
+          exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
+        },
+        mutation: {
+          exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
+        },
+        debug: CONFIG.DEBUG,
+      },
+    }),
+  ),
+)
diff --git a/backend/src/resolvers/badges.spec.js b/backend/src/schema/resolvers/badges.spec.js
similarity index 98%
rename from backend/src/resolvers/badges.spec.js
rename to backend/src/schema/resolvers/badges.spec.js
index 8383d9838..a0dbafe00 100644
--- a/backend/src/resolvers/badges.spec.js
+++ b/backend/src/schema/resolvers/badges.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
diff --git a/backend/src/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
similarity index 90%
rename from backend/src/resolvers/comments.js
rename to backend/src/schema/resolvers/comments.js
index 949b77041..7f3b11da4 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -53,6 +53,11 @@ export default {
       )
       session.close()
 
+      return comment
+    },
+    DeleteComment: async (object, params, context, resolveInfo) => {
+      const comment = await neo4jgraphql(object, params, context, resolveInfo, false)
+
       return comment
     },
   },
diff --git a/backend/src/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
similarity index 62%
rename from backend/src/resolvers/comments.spec.js
rename to backend/src/schema/resolvers/comments.spec.js
index 451c559f1..55b946bb9 100644
--- a/backend/src/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -1,6 +1,7 @@
-import Factory from '../seed/factories'
+import gql from 'graphql-tag'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
@@ -21,22 +22,22 @@ afterEach(async () => {
 })
 
 describe('CreateComment', () => {
-  const createCommentMutation = `
-  mutation($postId: ID, $content: String!) {
-    CreateComment(postId: $postId, content: $content) {
-      id
-      content
+  const createCommentMutation = gql`
+    mutation($postId: ID, $content: String!) {
+      CreateComment(postId: $postId, content: $content) {
+        id
+        content
+      }
     }
-  }
   `
-  const createPostMutation = `
-  mutation($id: ID!, $title: String!, $content: String!) {
-    CreatePost(id: $id, title: $title, content: $content) {
-      id
+  const createPostMutation = gql`
+    mutation($id: ID!, $title: String!, $content: String!) {
+      CreatePost(id: $id, title: $title, content: $content) {
+        id
+      }
     }
-  }
   `
-  const commentQueryForPostId = `
+  const commentQueryForPostId = gql`
     query($content: String) {
       Comment(content: $content) {
         postId
@@ -59,8 +60,13 @@ describe('CreateComment', () => {
   describe('authenticated', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
       createCommentVariables = {
         postId: 'p1',
         content: "I'm authorised to comment",
@@ -88,15 +94,25 @@ describe('CreateComment', () => {
     it('assigns the authenticated user as author', async () => {
       await client.request(createCommentMutation, createCommentVariables)
 
-      const { User } = await client.request(`{
+      const { User } = await client.request(gql`
+        {
           User(email: "test@example.org") {
             comments {
               content
             }
           }
-        }`)
+        }
+      `)
 
-      expect(User).toEqual([{ comments: [{ content: "I'm authorised to comment" }] }])
+      expect(User).toEqual([
+        {
+          comments: [
+            {
+              content: "I'm authorised to comment",
+            },
+          ],
+        },
+      ])
     })
 
     it('throw an error if an empty string is sent from the editor as content', async () => {
@@ -186,7 +202,98 @@ describe('CreateComment', () => {
         commentQueryForPostId,
         commentQueryVariablesByContent,
       )
-      expect(Comment).toEqual([{ postId: null }])
+      expect(Comment).toEqual([
+        {
+          postId: null,
+        },
+      ])
+    })
+  })
+})
+
+describe('DeleteComment', () => {
+  const deleteCommentMutation = gql`
+    mutation($id: ID!) {
+      DeleteComment(id: $id) {
+        id
+      }
+    }
+  `
+
+  let deleteCommentVariables = {
+    id: 'c1',
+  }
+
+  beforeEach(async () => {
+    const asAuthor = Factory()
+    await asAuthor.create('User', {
+      email: 'author@example.org',
+      password: '1234',
+    })
+    await asAuthor.authenticateAs({
+      email: 'author@example.org',
+      password: '1234',
+    })
+    await asAuthor.create('Post', {
+      id: 'p1',
+      content: 'Post to be commented',
+    })
+    await asAuthor.create('Comment', {
+      id: 'c1',
+      postId: 'p1',
+      content: 'Comment to be deleted',
+    })
+  })
+
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      client = new GraphQLClient(host)
+      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+        'Not Authorised',
+      )
+    })
+  })
+
+  describe('authenticated but not the author', () => {
+    beforeEach(async () => {
+      let headers
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
+    })
+
+    it('throws authorization error', async () => {
+      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+        'Not Authorised',
+      )
+    })
+  })
+
+  describe('authenticated as author', () => {
+    beforeEach(async () => {
+      let headers
+      headers = await login({
+        email: 'author@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
+    })
+
+    it('deletes the comment', async () => {
+      const expected = {
+        DeleteComment: {
+          id: 'c1',
+        },
+      }
+      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).resolves.toEqual(
+        expected,
+      )
     })
   })
 })
diff --git a/backend/src/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
similarity index 100%
rename from backend/src/resolvers/fileUpload/index.js
rename to backend/src/schema/resolvers/fileUpload/index.js
diff --git a/backend/src/resolvers/fileUpload/spec.js b/backend/src/schema/resolvers/fileUpload/spec.js
similarity index 100%
rename from backend/src/resolvers/fileUpload/spec.js
rename to backend/src/schema/resolvers/fileUpload/spec.js
diff --git a/backend/src/resolvers/follow.js b/backend/src/schema/resolvers/follow.js
similarity index 100%
rename from backend/src/resolvers/follow.js
rename to backend/src/schema/resolvers/follow.js
diff --git a/backend/src/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js
similarity index 97%
rename from backend/src/resolvers/follow.spec.js
rename to backend/src/schema/resolvers/follow.spec.js
index 4a361b03d..d29e17938 100644
--- a/backend/src/resolvers/follow.spec.js
+++ b/backend/src/schema/resolvers/follow.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let clientUser1
diff --git a/backend/src/resolvers/index.js b/backend/src/schema/resolvers/index.js
similarity index 100%
rename from backend/src/resolvers/index.js
rename to backend/src/schema/resolvers/index.js
diff --git a/backend/src/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
similarity index 100%
rename from backend/src/resolvers/moderation.js
rename to backend/src/schema/resolvers/moderation.js
diff --git a/backend/src/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
similarity index 99%
rename from backend/src/resolvers/moderation.spec.js
rename to backend/src/schema/resolvers/moderation.spec.js
index 835e9e535..b1dec603b 100644
--- a/backend/src/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
diff --git a/backend/src/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
similarity index 100%
rename from backend/src/resolvers/notifications.js
rename to backend/src/schema/resolvers/notifications.js
diff --git a/backend/src/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
similarity index 98%
rename from backend/src/resolvers/notifications.spec.js
rename to backend/src/schema/resolvers/notifications.spec.js
index 37d8c83ff..3876a4be3 100644
--- a/backend/src/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
diff --git a/backend/src/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
similarity index 100%
rename from backend/src/resolvers/posts.js
rename to backend/src/schema/resolvers/posts.js
diff --git a/backend/src/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
similarity index 98%
rename from backend/src/resolvers/posts.spec.js
rename to backend/src/schema/resolvers/posts.spec.js
index e4175ff09..9e2ec70a2 100644
--- a/backend/src/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
diff --git a/backend/src/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
similarity index 100%
rename from backend/src/resolvers/reports.js
rename to backend/src/schema/resolvers/reports.js
diff --git a/backend/src/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
similarity index 98%
rename from backend/src/resolvers/reports.spec.js
rename to backend/src/schema/resolvers/reports.spec.js
index 19b5e6f9e..6b996b016 100644
--- a/backend/src/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 
diff --git a/backend/src/resolvers/rewards.js b/backend/src/schema/resolvers/rewards.js
similarity index 100%
rename from backend/src/resolvers/rewards.js
rename to backend/src/schema/resolvers/rewards.js
diff --git a/backend/src/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
similarity index 98%
rename from backend/src/resolvers/rewards.spec.js
rename to backend/src/schema/resolvers/rewards.spec.js
index e2b67b25d..2bdd9a39b 100644
--- a/backend/src/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 
diff --git a/backend/src/resolvers/shout.js b/backend/src/schema/resolvers/shout.js
similarity index 100%
rename from backend/src/resolvers/shout.js
rename to backend/src/schema/resolvers/shout.js
diff --git a/backend/src/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
similarity index 97%
rename from backend/src/resolvers/shout.spec.js
rename to backend/src/schema/resolvers/shout.spec.js
index 46570efa0..a94f7ca0b 100644
--- a/backend/src/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let clientUser1, clientUser2
diff --git a/backend/src/resolvers/socialMedia.js b/backend/src/schema/resolvers/socialMedia.js
similarity index 100%
rename from backend/src/resolvers/socialMedia.js
rename to backend/src/schema/resolvers/socialMedia.js
diff --git a/backend/src/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js
similarity index 73%
rename from backend/src/resolvers/socialMedia.spec.js
rename to backend/src/schema/resolvers/socialMedia.spec.js
index 5143587b1..38850761c 100644
--- a/backend/src/resolvers/socialMedia.spec.js
+++ b/backend/src/schema/resolvers/socialMedia.spec.js
@@ -1,13 +1,14 @@
-import Factory from '../seed/factories'
+import gql from 'graphql-tag'
 import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../jest/helpers'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 
-describe('CreateSocialMedia', () => {
+describe('SocialMedia', () => {
   let client
   let headers
-  const mutationC = `
+  const mutationC = gql`
     mutation($url: String!) {
       CreateSocialMedia(url: $url) {
         id
@@ -15,7 +16,7 @@ describe('CreateSocialMedia', () => {
       }
     }
   `
-  const mutationD = `
+  const mutationD = gql`
     mutation($id: ID!) {
       DeleteSocialMedia(id: $id) {
         id
@@ -42,19 +43,28 @@ describe('CreateSocialMedia', () => {
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       client = new GraphQLClient(host)
-      const variables = { url: 'http://nsosp.org' }
+      const variables = {
+        url: 'http://nsosp.org',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Not Authorised')
     })
   })
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
     })
 
     it('creates social media with correct URL', async () => {
-      const variables = { url: 'http://nsosp.org' }
+      const variables = {
+        url: 'http://nsosp.org',
+      }
       await expect(client.request(mutationC, variables)).resolves.toEqual(
         expect.objectContaining({
           CreateSocialMedia: {
@@ -66,11 +76,15 @@ describe('CreateSocialMedia', () => {
     })
 
     it('deletes social media', async () => {
-      const creationVariables = { url: 'http://nsosp.org' }
+      const creationVariables = {
+        url: 'http://nsosp.org',
+      }
       const { CreateSocialMedia } = await client.request(mutationC, creationVariables)
       const { id } = CreateSocialMedia
 
-      const deletionVariables = { id }
+      const deletionVariables = {
+        id,
+      }
       const expected = {
         DeleteSocialMedia: {
           id: id,
@@ -81,12 +95,16 @@ describe('CreateSocialMedia', () => {
     })
 
     it('rejects empty string', async () => {
-      const variables = { url: '' }
+      const variables = {
+        url: '',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
     })
 
     it('validates URLs', async () => {
-      const variables = { url: 'not-a-url' }
+      const variables = {
+        url: 'not-a-url',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
     })
   })
diff --git a/backend/src/resolvers/statistics.js b/backend/src/schema/resolvers/statistics.js
similarity index 100%
rename from backend/src/resolvers/statistics.js
rename to backend/src/schema/resolvers/statistics.js
diff --git a/backend/src/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
similarity index 98%
rename from backend/src/resolvers/user_management.js
rename to backend/src/schema/resolvers/user_management.js
index e2fd5acf1..eb07a07b3 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -1,4 +1,4 @@
-import encode from '../jwt/encode'
+import encode from '../../jwt/encode'
 import bcrypt from 'bcryptjs'
 import { AuthenticationError } from 'apollo-server'
 import { neo4jgraphql } from 'neo4j-graphql-js'
diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
similarity index 98%
rename from backend/src/resolvers/user_management.spec.js
rename to backend/src/schema/resolvers/user_management.spec.js
index 9dff9e388..cf648a6bd 100644
--- a/backend/src/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -1,8 +1,9 @@
 import gql from 'graphql-tag'
-import Factory from '../seed/factories'
 import { GraphQLClient, request } from 'graphql-request'
 import jwt from 'jsonwebtoken'
-import { host, login } from '../jest/helpers'
+import CONFIG from './../../config'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 
@@ -185,7 +186,7 @@ describe('login', () => {
           }),
         )
         const token = data.login
-        jwt.verify(token, process.env.JWT_SECRET, (err, data) => {
+        jwt.verify(token, CONFIG.JWT_SECRET, (err, data) => {
           expect(data.email).toEqual('test@example.org')
           expect(err).toBeNull()
         })
diff --git a/backend/src/resolvers/users.js b/backend/src/schema/resolvers/users.js
similarity index 100%
rename from backend/src/resolvers/users.js
rename to backend/src/schema/resolvers/users.js
diff --git a/backend/src/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
similarity index 95%
rename from backend/src/resolvers/users.spec.js
rename to backend/src/schema/resolvers/users.spec.js
index 22096b6c8..a5c50f4f9 100644
--- a/backend/src/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -1,6 +1,6 @@
 import { GraphQLClient } from 'graphql-request'
-import { host } from '../jest/helpers'
-import Factory from '../seed/factories'
+import { host } from '../../jest/helpers'
+import Factory from '../../seed/factories'
 
 const factory = Factory()
 let client
diff --git a/backend/src/types/enum/BadgeStatus.gql b/backend/src/schema/types/enum/BadgeStatus.gql
similarity index 100%
rename from backend/src/types/enum/BadgeStatus.gql
rename to backend/src/schema/types/enum/BadgeStatus.gql
diff --git a/backend/src/types/enum/BadgeType.gql b/backend/src/schema/types/enum/BadgeType.gql
similarity index 100%
rename from backend/src/types/enum/BadgeType.gql
rename to backend/src/schema/types/enum/BadgeType.gql
diff --git a/backend/src/types/enum/UserGroup.gql b/backend/src/schema/types/enum/UserGroup.gql
similarity index 100%
rename from backend/src/types/enum/UserGroup.gql
rename to backend/src/schema/types/enum/UserGroup.gql
diff --git a/backend/src/types/enum/Visibility.gql b/backend/src/schema/types/enum/Visibility.gql
similarity index 100%
rename from backend/src/types/enum/Visibility.gql
rename to backend/src/schema/types/enum/Visibility.gql
diff --git a/backend/src/types/index.js b/backend/src/schema/types/index.js
similarity index 100%
rename from backend/src/types/index.js
rename to backend/src/schema/types/index.js
diff --git a/backend/src/types/scalar/Date.gql_ b/backend/src/schema/types/scalar/Date.gql_
similarity index 100%
rename from backend/src/types/scalar/Date.gql_
rename to backend/src/schema/types/scalar/Date.gql_
diff --git a/backend/src/types/scalar/DateTime.gql_ b/backend/src/schema/types/scalar/DateTime.gql_
similarity index 100%
rename from backend/src/types/scalar/DateTime.gql_
rename to backend/src/schema/types/scalar/DateTime.gql_
diff --git a/backend/src/types/scalar/Time.gql_ b/backend/src/schema/types/scalar/Time.gql_
similarity index 100%
rename from backend/src/types/scalar/Time.gql_
rename to backend/src/schema/types/scalar/Time.gql_
diff --git a/backend/src/types/scalar/Upload.gql b/backend/src/schema/types/scalar/Upload.gql
similarity index 100%
rename from backend/src/types/scalar/Upload.gql
rename to backend/src/schema/types/scalar/Upload.gql
diff --git a/backend/src/types/schema.gql b/backend/src/schema/types/schema.gql
similarity index 100%
rename from backend/src/types/schema.gql
rename to backend/src/schema/types/schema.gql
diff --git a/backend/src/types/schema_full.gql_ b/backend/src/schema/types/schema_full.gql_
similarity index 100%
rename from backend/src/types/schema_full.gql_
rename to backend/src/schema/types/schema_full.gql_
diff --git a/backend/src/types/type/Badge.gql b/backend/src/schema/types/type/Badge.gql
similarity index 100%
rename from backend/src/types/type/Badge.gql
rename to backend/src/schema/types/type/Badge.gql
diff --git a/backend/src/types/type/Category.gql b/backend/src/schema/types/type/Category.gql
similarity index 100%
rename from backend/src/types/type/Category.gql
rename to backend/src/schema/types/type/Category.gql
diff --git a/backend/src/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
similarity index 100%
rename from backend/src/types/type/Comment.gql
rename to backend/src/schema/types/type/Comment.gql
diff --git a/backend/src/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
similarity index 100%
rename from backend/src/types/type/Post.gql
rename to backend/src/schema/types/type/Post.gql
diff --git a/backend/src/types/type/Tag.gql b/backend/src/schema/types/type/Tag.gql
similarity index 100%
rename from backend/src/types/type/Tag.gql
rename to backend/src/schema/types/type/Tag.gql
diff --git a/backend/src/types/type/User.gql b/backend/src/schema/types/type/User.gql
similarity index 100%
rename from backend/src/types/type/User.gql
rename to backend/src/schema/types/type/User.gql
diff --git a/backend/src/seed/reset-db.js b/backend/src/seed/reset-db.js
index 3197a6e18..5f4319f73 100644
--- a/backend/src/seed/reset-db.js
+++ b/backend/src/seed/reset-db.js
@@ -1,10 +1,8 @@
 import { cleanDatabase } from './factories'
-import dotenv from 'dotenv'
+import CONFIG from './../config'
 
-dotenv.config()
-
-if (process.env.NODE_ENV === 'production') {
-  throw new Error(`YOU CAN'T CLEAN THE DATABASE WITH NODE_ENV=${process.env.NODE_ENV}`)
+if (!CONFIG.DEBUG) {
+  throw new Error(`YOU CAN'T CLEAN THE DATABASE WITH DEBUG=${CONFIG.DEBUG}`)
 }
 
 ;(async function() {
diff --git a/backend/src/server.js b/backend/src/server.js
index 59261302f..7692f0d2c 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -1,48 +1,27 @@
-import { GraphQLServer } from 'graphql-yoga'
-import { makeAugmentedSchema } from 'neo4j-graphql-js'
-import { typeDefs, resolvers } from './graphql-schema'
 import express from 'express'
-import dotenv from 'dotenv'
+import helmet from 'helmet'
+import { GraphQLServer } from 'graphql-yoga'
+import CONFIG, { requiredConfigs } from './config'
 import mocks from './mocks'
 import middleware from './middleware'
-import applyDirectives from './bootstrap/directives'
-import applyScalars from './bootstrap/scalars'
 import { getDriver } from './bootstrap/neo4j'
-import helmet from 'helmet'
 import decode from './jwt/decode'
+import schema from './schema'
 
-dotenv.config()
-// check env and warn
-const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET', 'PRIVATE_KEY_PASSPHRASE']
-requiredEnvVars.forEach(env => {
-  if (!process.env[env]) {
-    throw new Error(`ERROR: "${env}" env variable is missing.`)
+// check required configs and throw error
+// TODO check this directly in config file - currently not possible due to testsetup
+Object.entries(requiredConfigs).map(entry => {
+  if (!entry[1]) {
+    throw new Error(`ERROR: "${entry[0]}" env variable is missing.`)
   }
 })
 
 const driver = getDriver()
-const debug = process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'true'
-
-let schema = makeAugmentedSchema({
-  typeDefs,
-  resolvers,
-  config: {
-    query: {
-      exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
-    },
-    mutation: {
-      exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
-    },
-    debug: debug,
-  },
-})
-schema = applyScalars(applyDirectives(schema))
 
 const createServer = options => {
   const defaults = {
     context: async ({ request }) => {
-      const authorizationHeader = request.headers.authorization || ''
-      const user = await decode(driver, authorizationHeader)
+      const user = await decode(driver, request.headers.authorization)
       return {
         driver,
         user,
@@ -52,11 +31,11 @@ const createServer = options => {
         },
       }
     },
-    schema: schema,
-    debug: debug,
-    tracing: debug,
+    schema,
+    debug: CONFIG.DEBUG,
+    tracing: CONFIG.DEBUG,
     middlewares: middleware(schema),
-    mocks: process.env.MOCK === 'true' ? mocks : false,
+    mocks: CONFIG.MOCKS ? mocks : false,
   }
   const server = new GraphQLServer(Object.assign({}, defaults, options))
 
diff --git a/deployment/human-connection/templates/configmap.template.yaml b/deployment/human-connection/templates/configmap.template.yaml
index baf41661a..87b51a7d3 100644
--- a/deployment/human-connection/templates/configmap.template.yaml
+++ b/deployment/human-connection/templates/configmap.template.yaml
@@ -4,7 +4,7 @@
   data:
     GRAPHQL_PORT: "4000"
     GRAPHQL_URI: "http://nitro-backend.human-connection:4000"
-    MOCK: "false"
+    MOCKS: "false"
     NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687"
     NEO4J_USER: "neo4j"
     NEO4J_AUTH: "none"
diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml
index 4ff307594..e536b1157 100644
--- a/docker-compose.maintenance.yml
+++ b/docker-compose.maintenance.yml
@@ -19,7 +19,7 @@ services:
       - GRAPHQL_URI=http://localhost:4000
       - CLIENT_URI=http://localhost:3000
       - JWT_SECRET=b/&&7b78BF&fv/Vd
-      - MOCK=false
+      - MOCKS=false
       - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
       - NEO4J_apoc_import_file_enabled=true
diff --git a/docker-compose.yml b/docker-compose.yml
index 896d1bef9..ca66217c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - GRAPHQL_URI=http://localhost:4000
       - CLIENT_URI=http://localhost:3000
       - JWT_SECRET=b/&&7b78BF&fv/Vd
-      - MOCK=false
+      - MOCKS=false
       - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
   neo4j:
diff --git a/webapp/components/Comment.spec.js b/webapp/components/Comment.spec.js
index ebb9b8bf8..e899a05e1 100644
--- a/webapp/components/Comment.spec.js
+++ b/webapp/components/Comment.spec.js
@@ -14,11 +14,20 @@ describe('Comment.vue', () => {
   let propsData
   let mocks
   let getters
+  let wrapper
+  let Wrapper
 
   beforeEach(() => {
     propsData = {}
     mocks = {
       $t: jest.fn(),
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue(),
+      },
     }
     getters = {
       'auth/user': () => {
@@ -29,11 +38,16 @@ describe('Comment.vue', () => {
   })
 
   describe('shallowMount', () => {
-    const Wrapper = () => {
+    Wrapper = () => {
       const store = new Vuex.Store({
         getters,
       })
-      return shallowMount(Comment, { store, propsData, mocks, localVue })
+      return shallowMount(Comment, {
+        store,
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('given a comment', () => {
@@ -45,7 +59,7 @@ describe('Comment.vue', () => {
       })
 
       it('renders content', () => {
-        const wrapper = Wrapper()
+        wrapper = Wrapper()
         expect(wrapper.text()).toMatch('Hello I am a comment content')
       })
 
@@ -55,17 +69,17 @@ describe('Comment.vue', () => {
         })
 
         it('renders no comment data', () => {
-          const wrapper = Wrapper()
+          wrapper = Wrapper()
           expect(wrapper.text()).not.toMatch('comment content')
         })
 
         it('has no "disabled-content" css class', () => {
-          const wrapper = Wrapper()
+          wrapper = Wrapper()
           expect(wrapper.classes()).not.toContain('disabled-content')
         })
 
         it('translates a placeholder', () => {
-          /* const wrapper = */ Wrapper()
+          wrapper = Wrapper()
           const calls = mocks.$t.mock.calls
           const expected = [['comment.content.unavailable-placeholder']]
           expect(calls).toEqual(expect.arrayContaining(expected))
@@ -77,16 +91,46 @@ describe('Comment.vue', () => {
           })
 
           it('renders comment data', () => {
-            const wrapper = Wrapper()
+            wrapper = Wrapper()
             expect(wrapper.text()).toMatch('comment content')
           })
 
           it('has a "disabled-content" css class', () => {
-            const wrapper = Wrapper()
+            wrapper = Wrapper()
             expect(wrapper.classes()).toContain('disabled-content')
           })
         })
       })
+
+      beforeEach(jest.useFakeTimers)
+
+      describe('test callbacks', () => {
+        beforeEach(() => {
+          wrapper = Wrapper()
+        })
+
+        describe('deletion of Comment from List by invoking "deleteCommentCallback()"', () => {
+          beforeEach(() => {
+            wrapper.vm.deleteCommentCallback()
+          })
+
+          describe('after timeout', () => {
+            beforeEach(jest.runAllTimers)
+
+            it('emits "deleteComment"', () => {
+              expect(wrapper.emitted().deleteComment.length).toBe(1)
+            })
+
+            it('does call mutation', () => {
+              expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+            })
+
+            it('mutation is successful', () => {
+              expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+            })
+          })
+        })
+      })
     })
   })
 })
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 751a11f02..862b95545 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -14,6 +14,7 @@
         placement="bottom-end"
         resource-type="comment"
         :resource="comment"
+        :callbacks="{ confirm: deleteCommentCallback, cancel: null }"
         style="float-right"
         :is-owner="isAuthor(author.id)"
       />
@@ -27,6 +28,7 @@
 </template>
 
 <script>
+import gql from 'graphql-tag'
 import { mapGetters } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
@@ -61,6 +63,25 @@ export default {
     isAuthor(id) {
       return this.user.id === id
     },
+    async deleteCommentCallback() {
+      try {
+        var gqlMutation = gql`
+          mutation($id: ID!) {
+            DeleteComment(id: $id) {
+              id
+            }
+          }
+        `
+        await this.$apollo.mutate({
+          mutation: gqlMutation,
+          variables: { id: this.comment.id },
+        })
+        this.$toast.success(this.$t(`delete.comment.success`))
+        this.$emit('deleteComment')
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
+    },
   },
 }
 </script>
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 6e5bca4c0..69289cb6d 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -28,6 +28,7 @@
 import Dropdown from '~/components/Dropdown'
 
 export default {
+  name: 'ContentMenu',
   components: {
     Dropdown,
   },
@@ -42,6 +43,7 @@ export default {
         return value.match(/(contribution|comment|organization|user)/)
       },
     },
+    callbacks: { type: Object, required: true },
   },
   computed: {
     routes() {
@@ -49,7 +51,7 @@ export default {
 
       if (this.isOwner && this.resourceType === 'contribution') {
         routes.push({
-          name: this.$t(`contribution.edit`),
+          name: this.$t(`post.menu.edit`),
           path: this.$router.resolve({
             name: 'post-edit-id',
             params: {
@@ -59,21 +61,29 @@ export default {
           icon: 'edit',
         })
         routes.push({
-          name: this.$t(`post.delete.title`),
+          name: this.$t(`post.menu.delete`),
           callback: () => {
             this.openModal('delete')
           },
           icon: 'trash',
         })
       }
+
       if (this.isOwner && this.resourceType === 'comment') {
+        // routes.push({
+        //   name: this.$t(`comment.menu.edit`),
+        //   callback: () => {
+        //     /* eslint-disable-next-line no-console */
+        //     console.log('EDIT COMMENT')
+        //   },
+        //   icon: 'edit'
+        // })
         routes.push({
-          name: this.$t(`comment.edit`),
+          name: this.$t(`comment.menu.delete`),
           callback: () => {
-            /* eslint-disable-next-line no-console */
-            console.log('EDIT COMMENT')
+            this.openModal('delete')
           },
-          icon: 'edit',
+          icon: 'trash',
         })
       }
 
@@ -125,6 +135,7 @@ export default {
         data: {
           type: this.resourceType,
           resource: this.resource,
+          callbacks: this.callbacks,
         },
       })
     },
diff --git a/webapp/components/Modal.spec.js b/webapp/components/Modal.spec.js
index 52d13c4a0..0e2158e96 100644
--- a/webapp/components/Modal.spec.js
+++ b/webapp/components/Modal.spec.js
@@ -1,5 +1,6 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils'
 import Modal from './Modal.vue'
+import DeleteModal from './Modal/DeleteModal.vue'
 import DisableModal from './Modal/DisableModal.vue'
 import ReportModal from './Modal/ReportModal.vue'
 import Vuex from 'vuex'
@@ -29,7 +30,11 @@ describe('Modal.vue', () => {
           'modal/SET_OPEN': mutations.SET_OPEN,
         },
       })
-      return mountMethod(Modal, { store, mocks, localVue })
+      return mountMethod(Modal, {
+        store,
+        mocks,
+        localVue,
+      })
     }
   }
 
@@ -55,6 +60,7 @@ describe('Modal.vue', () => {
 
     it('initially empty', () => {
       wrapper = Wrapper()
+      expect(wrapper.contains(DeleteModal)).toBe(false)
       expect(wrapper.contains(DisableModal)).toBe(false)
       expect(wrapper.contains(ReportModal)).toBe(false)
     })
@@ -69,6 +75,10 @@ describe('Modal.vue', () => {
               id: 'c456',
               title: 'some title',
             },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           },
         }
         wrapper = Wrapper()
@@ -83,6 +93,10 @@ describe('Modal.vue', () => {
           type: 'contribution',
           name: 'some title',
           id: 'c456',
+          callbacks: {
+            confirm: null,
+            cancel: null,
+          },
         })
       })
 
@@ -97,23 +111,49 @@ describe('Modal.vue', () => {
         it('passes author name to disable modal', () => {
           state.data = {
             type: 'comment',
-            resource: { id: 'c456', author: { name: 'Author name' } },
+            resource: {
+              id: 'c456',
+              author: {
+                name: 'Author name',
+              },
+            },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           }
           wrapper = Wrapper()
           expect(wrapper.find(DisableModal).props()).toEqual({
             type: 'comment',
             name: 'Author name',
             id: 'c456',
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           })
         })
 
         it('does not crash if author is undefined', () => {
-          state.data = { type: 'comment', resource: { id: 'c456' } }
+          state.data = {
+            type: 'comment',
+            resource: {
+              id: 'c456',
+            },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
+          }
           wrapper = Wrapper()
           expect(wrapper.find(DisableModal).props()).toEqual({
             type: 'comment',
             name: '',
             id: 'c456',
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           })
         })
       })
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index 88b89d407..efe1b8ab6 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -1,10 +1,12 @@
 <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"
       :type="data.type"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
     <report-modal
@@ -12,6 +14,7 @@
       :id="data.resource.id"
       :type="data.type"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
     <delete-modal
@@ -19,15 +22,16 @@
       :id="data.resource.id"
       :type="data.type"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
   </div>
 </template>
 
 <script>
+import DeleteModal from '~/components/Modal/DeleteModal'
 import DisableModal from '~/components/Modal/DisableModal'
 import ReportModal from '~/components/Modal/ReportModal'
-import DeleteModal from '~/components/Modal/DeleteModal'
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index bb463be5f..c5e9df001 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -2,17 +2,14 @@ import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
 import DeleteModal from './DeleteModal.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
-import VueRouter from 'vue-router'
 
-const routes = [{ path: '/' }]
-const router = new VueRouter({ routes })
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
 localVue.use(Styleguide)
-localVue.use(VueRouter)
 
 describe('DeleteModal.vue', () => {
+  let Wrapper
   let wrapper
   let propsData
   let mocks
@@ -20,79 +17,113 @@ describe('DeleteModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      id: 'c300',
+      id: 'p23',
+      name: 'It is a post',
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $t: jest.fn(),
       $filters: {
         truncate: a => a,
       },
-      $toast: {
-        success: () => {},
-        error: () => {},
-      },
-      $apollo: {
-        mutate: jest.fn().mockResolvedValue(),
-      },
     }
   })
 
   describe('shallowMount', () => {
-    const Wrapper = () => {
-      return shallowMount(DeleteModal, { propsData, mocks, localVue, router })
+    Wrapper = () => {
+      return shallowMount(DeleteModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('defaults', () => {
+      beforeEach(() => {
+        wrapper = Wrapper()
+      })
+
       it('success false', () => {
-        expect(Wrapper().vm.success).toBe(false)
+        expect(wrapper.vm.success).toBe(false)
       })
 
       it('loading false', () => {
-        expect(Wrapper().vm.loading).toBe(false)
+        expect(wrapper.vm.loading).toBe(false)
       })
     })
 
     describe('given a post', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
+          type: 'contribution',
           id: 'p23',
-          type: 'post',
           name: 'It is a post',
         }
+        wrapper = Wrapper()
       })
 
       it('mentions post title', () => {
-        Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['post.delete.message', { name: 'It is a post' }]]
+        const expected = [
+          [
+            'delete.contribution.message',
+            {
+              name: 'It is a post',
+            },
+          ],
+        ]
+        expect(calls).toEqual(expect.arrayContaining(expected))
+      })
+    })
+
+    describe('given a comment', () => {
+      beforeEach(() => {
+        propsData = {
+          ...propsData,
+          type: 'comment',
+          id: 'c4',
+          name: 'It is the user of the comment',
+        }
+        wrapper = Wrapper()
+      })
+
+      it('mentions comments user name', () => {
+        const calls = mocks.$t.mock.calls
+        const expected = [
+          [
+            'delete.comment.message',
+            {
+              name: 'It is the user of the comment',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
   })
 
   describe('mount', () => {
-    const Wrapper = () => {
-      return mount(DeleteModal, { propsData, mocks, localVue, router })
+    Wrapper = () => {
+      return mount(DeleteModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     beforeEach(jest.useFakeTimers)
 
-    it('renders', () => {
-      expect(Wrapper().is('div')).toBe(true)
-    })
-
-    describe('given id', () => {
+    describe('given post id', () => {
       beforeEach(() => {
-        propsData = {
-          type: 'user',
-          id: 'u3',
-        }
         wrapper = Wrapper()
       })
 
       describe('click cancel button', () => {
         beforeEach(() => {
-          wrapper = Wrapper()
           wrapper.find('button.cancel').trigger('click')
         })
 
@@ -103,12 +134,12 @@ describe('DeleteModal.vue', () => {
             expect(wrapper.vm.isOpen).toBe(false)
           })
 
-          it('emits "close"', () => {
-            expect(wrapper.emitted().close).toBeTruthy()
+          it('does call the cancel callback', () => {
+            expect(propsData.callbacks.cancel).toHaveBeenCalledTimes(1)
           })
 
-          it('does not call mutation', () => {
-            expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+          it('emits "close"', () => {
+            expect(wrapper.emitted().close).toBeTruthy()
           })
         })
       })
@@ -118,20 +149,10 @@ describe('DeleteModal.vue', () => {
           wrapper.find('button.confirm').trigger('click')
         })
 
-        it('calls delete mutation', () => {
-          expect(mocks.$apollo.mutate).toHaveBeenCalled()
-        })
-
         it('sets success', () => {
           expect(wrapper.vm.success).toBe(true)
         })
 
-        it('displays a success message', () => {
-          const calls = mocks.$t.mock.calls
-          const expected = [['post.delete.success']]
-          expect(calls).toEqual(expect.arrayContaining(expected))
-        })
-
         describe('after timeout', () => {
           beforeEach(jest.runAllTimers)
 
@@ -139,6 +160,9 @@ describe('DeleteModal.vue', () => {
             expect(wrapper.vm.isOpen).toBe(false)
           })
 
+          it('does call the confirm callback', () => {
+            expect(propsData.callbacks.confirm).toHaveBeenCalledTimes(1)
+          })
           it('emits close', () => {
             expect(wrapper.emitted().close).toBeTruthy()
           })
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 781771f7e..63703b8c6 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -10,19 +10,16 @@
     <p v-html="message" />
 
     <template slot="footer">
-      <ds-button class="cancel" icon="close" @click="cancel">
-        {{ $t('post.delete.cancel') }}
-      </ds-button>
+      <ds-button class="cancel" icon="close" @click="cancel">{{ $t('delete.cancel') }}</ds-button>
 
       <ds-button danger class="confirm" icon="trash" :loading="loading" @click="confirm">
-        {{ $t('post.delete.submit') }}
+        {{ $t('delete.submit') }}
       </ds-button>
     </template>
   </ds-modal>
 </template>
 
 <script>
-import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 
 export default {
@@ -33,6 +30,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true },
   },
   data() {
@@ -44,15 +42,18 @@ export default {
   },
   computed: {
     title() {
-      return this.$t(`post.delete.title`)
+      return this.$t(`delete.${this.type}.title`)
     },
     message() {
       const name = this.$filters.truncate(this.name, 30)
-      return this.$t(`post.delete.message`, { name })
+      return this.$t(`delete.${this.type}.message`, { name })
     },
   },
   methods: {
     async cancel() {
+      if (this.callbacks.cancel) {
+        await this.callbacks.cancel()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
@@ -61,35 +62,19 @@ export default {
     async confirm() {
       this.loading = true
       try {
-        await this.$apollo.mutate({
-          mutation: gql`
-            mutation($id: ID!) {
-              DeletePost(id: $id) {
-                id
-              }
-            }
-          `,
-          variables: { id: this.id },
-        })
+        if (this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         this.success = true
-        this.$toast.success(this.$t('post.delete.success'))
         setTimeout(() => {
           this.isOpen = false
           setTimeout(() => {
             this.success = false
             this.$emit('close')
-            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)
-            }
           }, 500)
         }, 1500)
       } catch (err) {
         this.success = false
-        this.$toast.error(err.message)
       } finally {
         this.loading = false
       }
diff --git a/webapp/components/Modal/DisableModal.spec.js b/webapp/components/Modal/DisableModal.spec.js
index 2d98fce52..02ae3fa5d 100644
--- a/webapp/components/Modal/DisableModal.spec.js
+++ b/webapp/components/Modal/DisableModal.spec.js
@@ -14,8 +14,12 @@ describe('DisableModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      name: 'blah',
       id: 'c42',
+      name: 'blah',
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $filters: {
@@ -34,22 +38,34 @@ describe('DisableModal.vue', () => {
 
   describe('shallowMount', () => {
     const Wrapper = () => {
-      return shallowMount(DisableModal, { propsData, mocks, localVue })
+      return shallowMount(DisableModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('given a user', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
-          id: 'u2',
           name: 'Bob Ross',
+          id: 'u2',
         }
       })
 
       it('mentions user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['disable.user.message', { name: 'Bob Ross' }]]
+        const expected = [
+          [
+            'disable.user.message',
+            {
+              name: 'Bob Ross',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -57,16 +73,24 @@ describe('DisableModal.vue', () => {
     describe('given a contribution', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'contribution',
-          id: 'c3',
           name: 'This is some post title.',
+          id: 'c3',
         }
       })
 
       it('mentions contribution title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['disable.contribution.message', { name: 'This is some post title.' }]]
+        const expected = [
+          [
+            'disable.contribution.message',
+            {
+              name: 'This is some post title.',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -74,13 +98,18 @@ describe('DisableModal.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(DisableModal, { propsData, mocks, localVue })
+      return mount(DisableModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
     beforeEach(jest.useFakeTimers)
 
     describe('given id', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4711',
         }
@@ -126,7 +155,9 @@ describe('DisableModal.vue', () => {
         it('passes id to mutation', () => {
           const calls = mocks.$apollo.mutate.mock.calls
           const [[{ variables }]] = calls
-          expect(variables).toEqual({ id: 'u4711' })
+          expect(variables).toEqual({
+            id: 'u4711',
+          })
         })
 
         it('fades away', () => {
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index 202e557d9..690dcbf70 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -19,9 +19,11 @@
 import gql from 'graphql-tag'
 
 export default {
+  name: 'DisableModal',
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true },
   },
   data() {
@@ -41,7 +43,10 @@ export default {
     },
   },
   methods: {
-    cancel() {
+    async cancel() {
+      if (this.callbacks.cancel) {
+        await this.callbacks.cancel()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
@@ -49,6 +54,9 @@ export default {
     },
     async confirm() {
       try {
+        if (this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         await this.$apollo.mutate({
           mutation: gql`
             mutation($id: ID!) {
diff --git a/webapp/components/Modal/ReportModal.spec.js b/webapp/components/Modal/ReportModal.spec.js
index c08788c3b..27262e998 100644
--- a/webapp/components/Modal/ReportModal.spec.js
+++ b/webapp/components/Modal/ReportModal.spec.js
@@ -17,6 +17,10 @@ describe('ReportModal.vue', () => {
     propsData = {
       type: 'contribution',
       id: 'c43',
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $t: jest.fn(),
@@ -35,7 +39,11 @@ describe('ReportModal.vue', () => {
 
   describe('shallowMount', () => {
     const Wrapper = () => {
-      return shallowMount(ReportModal, { propsData, mocks, localVue })
+      return shallowMount(ReportModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('defaults', () => {
@@ -51,6 +59,7 @@ describe('ReportModal.vue', () => {
     describe('given a user', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4',
           name: 'Bob Ross',
@@ -60,7 +69,14 @@ describe('ReportModal.vue', () => {
       it('mentions user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['report.user.message', { name: 'Bob Ross' }]]
+        const expected = [
+          [
+            'report.user.message',
+            {
+              name: 'Bob Ross',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -68,8 +84,9 @@ describe('ReportModal.vue', () => {
     describe('given a post', () => {
       beforeEach(() => {
         propsData = {
-          id: 'p23',
+          ...propsData,
           type: 'post',
+          id: 'p23',
           name: 'It is a post',
         }
       })
@@ -77,7 +94,14 @@ describe('ReportModal.vue', () => {
       it('mentions post title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['report.post.message', { name: 'It is a post' }]]
+        const expected = [
+          [
+            'report.post.message',
+            {
+              name: 'It is a post',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -85,7 +109,11 @@ describe('ReportModal.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(ReportModal, { propsData, mocks, localVue })
+      return mount(ReportModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     beforeEach(jest.useFakeTimers)
@@ -97,6 +125,7 @@ describe('ReportModal.vue', () => {
     describe('given id', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4711',
         }
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 8452ad5de..f556c9e6e 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -39,6 +39,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true },
   },
   data() {
@@ -59,6 +60,9 @@ export default {
   },
   methods: {
     async cancel() {
+      if (this.callbacks.cancel) {
+        await this.callbacks.cancel()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
@@ -67,6 +71,9 @@ export default {
     async confirm() {
       this.loading = true
       try {
+        if (this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         await this.$apollo.mutate({
           mutation: gql`
             mutation($id: ID!) {
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 65f31d5c6..d8172cb77 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -1,61 +1,68 @@
 <template>
-  <ds-card :image="post.image" :class="{ 'post-card': true, 'disabled-content': post.disabled }">
-    <!-- Post Link Target -->
-    <nuxt-link
-      class="post-link"
-      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-    >
-      {{ post.title }}
-    </nuxt-link>
-    <ds-space margin-bottom="small" />
-    <!-- Username, Image & Date of Post -->
-    <div>
-      <no-ssr>
-        <hc-user :user="post.author" :trunc="35" :date-time="post.createdAt" />
-      </no-ssr>
-      <hc-ribbon :text="$t('post.name')" />
-    </div>
-    <ds-space margin-bottom="small" />
-    <!-- Post Title -->
-    <ds-heading tag="h3" no-margin>
-      {{ post.title }}
-    </ds-heading>
-    <ds-space margin-bottom="small" />
-    <!-- Post Content Excerpt -->
-    <!-- eslint-disable vue/no-v-html -->
-    <!-- TODO: replace editor content with tiptap render view -->
-    <div class="hc-editor-content" v-html="excerpt" />
-    <!-- eslint-enable vue/no-v-html -->
-    <!-- Footer o the Post -->
-    <template slot="footer">
-      <div style="display: inline-block; opacity: .5;">
-        <!-- Categories -->
-        <hc-category
-          v-for="category in post.categories"
-          :key="category.id"
-          v-tooltip="{ content: category.name, placement: 'bottom-start', delay: { show: 500 } }"
-          :icon="category.icon"
-        />
+  <ds-flex-item :width="width">
+    <ds-card :image="post.image" :class="{ 'post-card': true, 'disabled-content': post.disabled }">
+      <!-- Post Link Target -->
+      <nuxt-link
+        class="post-link"
+        :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
+      >
+        {{ post.title }}
+      </nuxt-link>
+      <ds-space margin-bottom="small" />
+      <!-- Username, Image & Date of Post -->
+      <div>
+        <no-ssr>
+          <hc-user :user="post.author" :trunc="35" :date-time="post.createdAt" />
+        </no-ssr>
+        <hc-ribbon :text="$t('post.name')" />
       </div>
-      <no-ssr>
-        <div style="display: inline-block; float: right">
-          <!-- Shouts Count -->
-          <span :style="{ opacity: post.shoutedCount ? 1 : 0.5 }">
-            <ds-icon name="bullhorn" />
-            <small>{{ post.shoutedCount }}</small>
-          </span>
-          &nbsp;
-          <!-- Comments Count -->
-          <span :style="{ opacity: post.commentsCount ? 1 : 0.5 }">
-            <ds-icon name="comments" />
-            <small>{{ post.commentsCount }}</small>
-          </span>
-          <!-- Menu -->
-          <content-menu resource-type="contribution" :resource="post" :is-owner="isAuthor" />
+      <ds-space margin-bottom="small" />
+      <!-- Post Title -->
+      <ds-heading tag="h3" no-margin>
+        {{ post.title }}
+      </ds-heading>
+      <ds-space margin-bottom="small" />
+      <!-- Post Content Excerpt -->
+      <!-- eslint-disable vue/no-v-html -->
+      <!-- TODO: replace editor content with tiptap render view -->
+      <div class="hc-editor-content" v-html="excerpt" />
+      <!-- eslint-enable vue/no-v-html -->
+      <!-- Footer o the Post -->
+      <template slot="footer">
+        <div style="display: inline-block; opacity: .5;">
+          <!-- Categories -->
+          <hc-category
+            v-for="category in post.categories"
+            :key="category.id"
+            v-tooltip="{ content: category.name, placement: 'bottom-start', delay: { show: 500 } }"
+            :icon="category.icon"
+          />
         </div>
-      </no-ssr>
-    </template>
-  </ds-card>
+        <no-ssr>
+          <div style="display: inline-block; float: right">
+            <!-- Shouts Count -->
+            <span :style="{ opacity: post.shoutedCount ? 1 : 0.5 }">
+              <ds-icon name="bullhorn" />
+              <small>{{ post.shoutedCount }}</small>
+            </span>
+            &nbsp;
+            <!-- Comments Count -->
+            <span :style="{ opacity: post.commentsCount ? 1 : 0.5 }">
+              <ds-icon name="comments" />
+              <small>{{ post.commentsCount }}</small>
+            </span>
+            <!-- Menu -->
+            <content-menu
+              resource-type="contribution"
+              :resource="post"
+              :callbacks="{ confirm: deletePostCallback, cancel: null }"
+              :is-owner="isAuthor"
+            />
+          </div>
+        </no-ssr>
+      </template>
+    </ds-card>
+  </ds-flex-item>
 </template>
 
 <script>
@@ -65,6 +72,7 @@ import HcCategory from '~/components/Category'
 import HcRibbon from '~/components/Ribbon'
 // import { randomBytes } from 'crypto'
 import { mapGetters } from 'vuex'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
   name: 'HcPostCard',
@@ -74,11 +82,16 @@ export default {
     HcRibbon,
     ContentMenu,
   },
+  mixins: [PostMutationHelpers],
   props: {
     post: {
       type: Object,
       required: true,
     },
+    width: {
+      type: Object,
+      default: () => {},
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index 387b844f4..d127bab47 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -17,7 +17,12 @@
     </h3>
     <ds-space margin-bottom="large" />
     <div v-if="comments && comments.length" id="comments" class="comments">
-      <comment v-for="comment in comments" :key="comment.id" :comment="comment" />
+      <comment
+        v-for="(comment, index) in comments"
+        :key="comment.id"
+        :comment="comment"
+        @deleteComment="comments.splice(index, 1)"
+      />
     </div>
     <hc-empty v-else name="empty" icon="messages" />
   </div>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e45bd9cba..8b20f763f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -135,19 +135,24 @@
     "takeAction": {
       "name": "Aktiv werden"
     },
-    "delete": {
-      "submit": "Löschen",
-      "cancel": "Abbrechen",
-      "success": "Beitrag erfolgreich gelöscht",
-      "title": "Beitrag löschen",
-      "type": "Beitrag",
-      "message": "Möchtest Du wirklich den Beitrag \"<b>{name}</b>\" löschen?"
+    "menu": {
+      "edit": "Beitrag bearbeiten",
+      "delete": "Beitrag löschen"
     },
     "comment": {
       "submit": "Kommentiere",
       "submitted": "Kommentar Gesendet"
     }
   },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "...dieser Kommentar ist nicht mehr verfügbar"
+    },
+    "menu": {
+      "edit": "Kommentar bearbeiten",
+      "delete": "Kommentar löschen"
+    }
+  },
   "quotes": {
     "african": {
       "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
@@ -210,6 +215,22 @@
       "message": "Bist du sicher, dass du den Kommentar \"<b>{name}</b>\" deaktivieren möchtest?"
     }
   },
+  "delete": {
+    "submit": "Löschen",
+    "cancel": "Abbrechen",
+    "contribution": {
+      "title": "Lösche Beitrag",
+      "type": "Contribution",
+      "message": "Bist du sicher, dass du den Beitrag \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Beitrag erfolgreich gelöscht!"
+    },
+    "comment": {
+      "title": "Lösche Kommentar",
+      "type": "Comment",
+      "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Kommentar erfolgreich gelöscht!"
+    }
+  },
   "report": {
     "submit": "Melden",
     "cancel": "Abbrechen",
@@ -230,17 +251,6 @@
       "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" melden möchtest?"
     }
   },
-  "contribution": {
-    "edit": "Beitrag bearbeiten",
-    "delete": "Beitrag löschen"
-  },
-  "comment": {
-    "edit": "Kommentar bearbeiten",
-    "delete": "Kommentar löschen",
-    "content": {
-      "unavailable-placeholder": "...dieser Kommentar ist nicht mehr verfügbar"
-    }
-  },
   "followButton": {
     "follow": "Folgen",
     "following": "Folge Ich"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c4d21b6e4..b4c7d91c2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -135,19 +135,24 @@
     "takeAction": {
       "name": "Take action"
     },
-    "delete": {
-      "submit": "Delete",
-      "cancel": "Cancel",
-      "success": "Post deleted successfully",
-      "title": "Delete Post",
-      "type": "Contribution",
-      "message": "Do you really want to delete the post \"<b>{name}</b>\"?"
+    "menu": {
+      "edit": "Edit Post",
+      "delete": "Delete Post"
     },
     "comment": {
       "submit": "Comment",
       "submitted": "Comment Submitted"
     }
   },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "...this comment is not available anymore"
+    },
+    "menu": {
+      "edit": "Edit Comment",
+      "delete": "Delete Comment"
+    }
+  },
   "quotes": {
     "african": {
       "quote": "Many small people in many small places do many small things, that can alter the face of the world.",
@@ -210,6 +215,22 @@
       "message": "Do you really want to disable the comment from \"<b>{name}</b>\"?"
     }
   },
+  "delete": {
+    "submit": "Delete",
+    "cancel": "Cancel",
+    "contribution": {
+      "title": "Delete Post",
+      "type": "Contribution",
+      "message": "Do you really want to delete the post \"<b>{name}</b>\"?",
+      "success": "Post successfully deleted!"
+    },
+    "comment": {
+      "title": "Delete Comment",
+      "type": "Comment",
+      "message": "Do you really want to delete the comment from \"<b>{name}</b>\"?",
+      "success": "Comment successfully deleted!"
+    }
+  },
   "report": {
     "submit": "Report",
     "cancel": "Cancel",
@@ -230,17 +251,6 @@
       "message": "Do you really want to report the comment from \"<b>{name}</b>\"?"
     }
   },
-  "contribution": {
-    "edit": "Edit Contribution",
-    "delete": "Delete Contribution"
-  },
-  "comment": {
-    "edit": "Edit Comment",
-    "delete": "Delete Comment",
-    "content": {
-      "unavailable-placeholder": "...this comment is not available anymore"
-    }
-  },
   "followButton": {
     "follow": "Follow",
     "following": "Following"
diff --git a/webapp/mixins/PostMutationHelpers.js b/webapp/mixins/PostMutationHelpers.js
new file mode 100644
index 000000000..2e7a91e4d
--- /dev/null
+++ b/webapp/mixins/PostMutationHelpers.js
@@ -0,0 +1,39 @@
+import gql from 'graphql-tag'
+
+export default {
+  methods: {
+    async deletePostCallback(postDisplayType = 'list') {
+      // console.log('inside "deletePostCallback" !!! ', this.post)
+      try {
+        var gqlMutation = gql`
+          mutation($id: ID!) {
+            DeletePost(id: $id) {
+              id
+            }
+          }
+        `
+        await this.$apollo.mutate({
+          mutation: gqlMutation,
+          variables: {
+            id: this.post.id,
+          },
+        })
+        this.$toast.success(this.$t('delete.contribution.success'))
+        // console.log('called "this.$t" !!!')
+        switch (postDisplayType) {
+          case 'list':
+            this.$emit('deletePost')
+            // console.log('emitted "deletePost" !!!')
+            break
+          default:
+            // case 'page'
+            // console.log('called "this.$router.history.push" !!!')
+            this.$router.history.push('/') // Single page type: Redirect to index (main) page
+            break
+        }
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
+    },
+  },
+}
diff --git a/webapp/package.json b/webapp/package.json
index fc9c0caeb..3541c87de 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -29,7 +29,6 @@
       "!**/?(*.)+(spec|test).js?(x)"
     ],
     "coverageReporters": [
-      "text",
       "lcov"
     ],
     "transform": {
@@ -71,7 +70,7 @@
     "stack-utils": "^1.0.2",
     "string-hash": "^1.1.3",
     "tiptap": "1.20.1",
-    "tiptap-extensions": "1.20.1",
+    "tiptap-extensions": "1.20.2",
     "v-tooltip": "~2.0.2",
     "vue-count-to": "~1.0.13",
     "vue-in-viewport-mixin": "^2.0.0",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 0a0e7159f..a45a99656 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <ds-flex v-if="Post && Post.length" :width="{ base: '100%' }" gutter="base">
-      <ds-flex-item
-        v-for="post in uniq(Post)"
+      <hc-post-card
+        v-for="(post, index) in uniq(Post)"
         :key="post.id"
+        :post="post"
         :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
-      >
-        <hc-post-card :post="post" />
-      </ds-flex-item>
+        @deletePost="deletePost(index, post.id)"
+      />
     </ds-flex>
     <no-ssr>
       <ds-button
@@ -78,6 +78,14 @@ export default {
         fetchPolicy: 'cache-and-network',
       })
     },
+    deletePost(_index, postId) {
+      this.Post = this.Post.filter(post => {
+        return post.id !== postId
+      })
+      // Why "uniq(Post)" is used in the array for list creation?
+      // Ideal solution here:
+      // this.Post.splice(index, 1)
+    },
   },
   apollo: {
     Post: {
diff --git a/webapp/pages/post/_id/_slug/index.spec.js b/webapp/pages/post/_id/_slug/index.spec.js
new file mode 100644
index 000000000..5bf4ea168
--- /dev/null
+++ b/webapp/pages/post/_id/_slug/index.spec.js
@@ -0,0 +1,100 @@
+import { config, shallowMount, createLocalVue } from '@vue/test-utils'
+import PostSlug from './index.vue'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+
+config.stubs['no-ssr'] = '<span><slot /></span>'
+
+describe('PostSlug', () => {
+  let wrapper
+  let Wrapper
+  let store
+  let mocks
+
+  beforeEach(() => {
+    store = new Vuex.Store({
+      getters: {
+        'auth/user': () => {
+          return {}
+        },
+      },
+    })
+    mocks = {
+      $t: jest.fn(),
+      $filters: {
+        truncate: a => a,
+      },
+      // If you mocking router, than don't use VueRouter with lacalVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
+      $router: {
+        history: {
+          push: jest.fn(),
+        },
+      },
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue(),
+      },
+    }
+  })
+
+  describe('shallowMount', () => {
+    Wrapper = () => {
+      return shallowMount(PostSlug, {
+        store,
+        mocks,
+        localVue,
+      })
+    }
+
+    beforeEach(jest.useFakeTimers)
+
+    describe('test mixin "PostMutationHelpers"', () => {
+      beforeEach(() => {
+        wrapper = Wrapper()
+        wrapper.setData({
+          post: {
+            id: 'p23',
+            name: 'It is a post',
+            author: {
+              id: 'u1',
+            },
+          },
+        })
+      })
+
+      describe('deletion of Post from Page by invoking "deletePostCallback(`page`)"', () => {
+        beforeEach(() => {
+          wrapper.vm.deletePostCallback('page')
+        })
+
+        describe('after timeout', () => {
+          beforeEach(jest.runAllTimers)
+
+          it('not emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost).toBeFalsy()
+          })
+
+          it('does go to index (main) page', () => {
+            expect(mocks.$router.history.push).toHaveBeenCalledTimes(1)
+          })
+
+          it('does call mutation', () => {
+            expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+          })
+
+          it('mutation is successful', () => {
+            expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 778350fd2..81f05c36c 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -12,6 +12,7 @@
           placement="bottom-end"
           resource-type="contribution"
           :resource="post"
+          :callbacks="{ confirm: () => deletePostCallback('page'), cancel: null }"
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
@@ -71,8 +72,10 @@ import HcUser from '~/components/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
 import HcCommentForm from '~/components/comments/CommentForm'
 import HcCommentList from '~/components/comments/CommentList'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
+  name: 'PostSlug',
   transition: {
     name: 'slide-up',
     mode: 'out-in',
@@ -86,6 +89,7 @@ export default {
     HcCommentForm,
     HcCommentList,
   },
+  mixins: [PostMutationHelpers],
   head() {
     return {
       title: this.title,
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index a1f2f1667..1cb93ae6c 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -20,7 +20,7 @@
       &nbsp;
       <!--<ds-tag
         v-for="category in post.categories"
-        :key="category.id"><ds-icon :name="category.icon" /> {{ category.name }}</ds-tag>-->
+      :key="category.id"><ds-icon :name="category.icon" /> {{ category.name }}</ds-tag>-->
     </div>
     <template v-if="post.tags && post.tags.length">
       <h3>
@@ -37,13 +37,13 @@
     <h3>Verwandte Beiträge</h3>
     <ds-section style="margin: 0 -1.5rem; padding: 1.5rem;">
       <ds-flex v-if="post.relatedContributions && post.relatedContributions.length" gutter="small">
-        <ds-flex-item
-          v-for="relatedPost in post.relatedContributions"
+        <hc-post-card
+          v-for="(relatedPost, index) in post.relatedContributions"
           :key="relatedPost.id"
+          :post="relatedPost"
           :width="{ base: '100%', lg: 1 }"
-        >
-          <hc-post-card :post="relatedPost" />
-        </ds-flex-item>
+          @deletePost="post.relatedContributions.splice(index, 1)"
+        />
       </ds-flex>
       <hc-empty v-else margin="large" icon="file" message="No related Posts" />
     </ds-section>
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
new file mode 100644
index 000000000..d79f9b885
--- /dev/null
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -0,0 +1,81 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import ProfileSlug from './_slug.vue'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+
+describe('ProfileSlug', () => {
+  let wrapper
+  let Wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      post: {
+        id: 'p23',
+        name: 'It is a post',
+      },
+      $t: jest.fn(),
+      // If you mocking router, than don't use VueRouter with lacalVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
+      $router: {
+        history: {
+          push: jest.fn(),
+        },
+      },
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue(),
+      },
+    }
+  })
+
+  describe('shallowMount', () => {
+    Wrapper = () => {
+      return shallowMount(ProfileSlug, {
+        mocks,
+        localVue,
+      })
+    }
+
+    beforeEach(jest.useFakeTimers)
+
+    describe('test mixin "PostMutationHelpers"', () => {
+      beforeEach(() => {
+        wrapper = Wrapper()
+      })
+
+      describe('deletion of Post from List by invoking "deletePostCallback(`list`)"', () => {
+        beforeEach(() => {
+          wrapper.vm.deletePostCallback('list')
+        })
+
+        describe('after timeout', () => {
+          beforeEach(jest.runAllTimers)
+
+          it('emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost.length).toBe(1)
+          })
+
+          it('does not go to index (main) page', () => {
+            expect(mocks.$router.history.push).not.toHaveBeenCalled()
+          })
+
+          it('does call mutation', () => {
+            expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+          })
+
+          it('mutation is successful', () => {
+            expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 669479e31..7aef41715 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -17,6 +17,7 @@
               placement="bottom-end"
               resource-type="user"
               :resource="user"
+              :callbacks="{ confirm: deletePostCallback, cancel: null }"
               :is-owner="myProfile"
               class="user-content-menu"
             />
@@ -183,13 +184,13 @@
             />
           </ds-flex-item>
           <template v-if="activePosts.length">
-            <ds-flex-item
-              v-for="post in activePosts"
+            <hc-post-card
+              v-for="(post, index) in activePosts"
               :key="post.id"
+              :post="post"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-            >
-              <hc-post-card :post="post" />
-            </ds-flex-item>
+              @deletePost="user.contributions.splice(index, 1)"
+            />
           </template>
           <template v-else>
             <ds-flex-item :width="{ base: '100%' }">
@@ -216,6 +217,7 @@ import HcEmpty from '~/components/Empty.vue'
 import ContentMenu from '~/components/ContentMenu'
 import HcUpload from '~/components/Upload'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
   components: {
@@ -230,6 +232,7 @@ export default {
     ContentMenu,
     HcUpload,
   },
+  mixins: [PostMutationHelpers],
   transition: {
     name: 'slide-up',
     mode: 'out-in',
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b9d1c8188..469680cb0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -8931,10 +8931,10 @@ proper-lockfile@^4.1.1:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-prosemirror-collab@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.1.1.tgz#c8f5d951abaeac8a80818b6bd960f5a392b35b3f"
-  integrity sha512-BpXIB3WBD7UvgxuiasKOxlAZ78TTOdW+SQN4bbJan995tVx/wM/OZXtRJebS+tSWWAbRisHaO3ciFo732vuvdA==
+prosemirror-collab@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.1.2.tgz#622fdc52692a83045ba6914c01a0416ff35f646a"
+  integrity sha512-ew0p0XWlp3PYc4h20hOfix8UPSRaJMRHQQCMoIUzxoiBgGGij/N4pXIY+w/iw5JISgP8QYyOy5arOYnCzFJQlQ==
   dependencies:
     prosemirror-state "^1.0.0"
 
@@ -9014,10 +9014,10 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.2.3:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-tables@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.8.0.tgz#30d3adb388b3310b47605e615753521a2a4ca77c"
-  integrity sha512-D4okaUqh9wQPkuimkgbNExy1aG2z+BtsUDtacZHPL8tDB5rbFuE+cotjJPIUSK3Ky5gvI8it4gL1+Xo//nqguw==
+prosemirror-tables@^0.8.0, prosemirror-tables@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.8.1.tgz#ea99ad4effec99dd4e2fdb0b33cce4d2547eed83"
+  integrity sha512-6eY8I+NkyrXAQ1gmYkKo7XDLZaj0iGutdc/zT0+VMY15IzgBINwcRP62+miaCTuneLTKufMYzfUB37NjGJaetw==
   dependencies:
     prosemirror-keymap "^1.0.0"
     prosemirror-model "^1.0.0"
@@ -9037,10 +9037,15 @@ prosemirror-utils@^0.8.2:
   resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.2.tgz#e0e4a47cd45b1cff3d84464446d9f92adf4a558b"
   integrity sha512-jNIj3/eREx4x2FU6pFEUDmdVmtoRBuLA6JTjgNum/84Nf+Ns+Y9l0Q//R8EL/Qm/5J5xTg5/s+hmQkXaHY+ilA==
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.6:
-  version "1.9.6"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.6.tgz#8bf508b0e2d176cb7a80a2a7882d3cb3749ab4e9"
-  integrity sha512-b4yBGeq9jvmW+rvC48fjHL4+9zyT/6NSuaACT4bcL8LuLHYzb6KSSZaZ5v27oUPt2DXIYv3Nl/YoUxJa7r8ciA==
+prosemirror-utils@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.0.tgz#3ab616c94ccd61fcb18968f0d5aa273a9f1f28e4"
+  integrity sha512-YcvmHcq7phbn+OagJSvmne92qZG9dOVfb3zfuA1HuyWUif3hUDt2Yfu299BHqVkEkUCF6FN7Gi9folDQntMhxA==
+
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.6, prosemirror-view@^1.9.8:
+  version "1.9.8"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.8.tgz#47b961204a0b2e8ff87370c270d4f82598e81273"
+  integrity sha512-yS4yrqxydvi7ddz9VFLeJgbfVd5g3/bMcRxb1PbWtG0i9OrPSsiHaEBJHLVeTbraGqRlAu+tbNLakO7RhUhp1w==
   dependencies:
     prosemirror-model "^1.1.0"
     prosemirror-state "^1.0.0"
@@ -10557,36 +10562,36 @@ tippy.js@^4.3.1:
   dependencies:
     popper.js "^1.14.7"
 
-tiptap-commands@^1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.5.tgz#e897b59debdddcbc20f8289c92f9e39c5d22e19a"
-  integrity sha512-4OTdcf8IIDyd/CrRvJLfQpYaw+SGIuUJmwDDpxNCbcqnpHFsO1IkWdmV3loRab6Adg1UBNxeUKA8//nzpdJcUQ==
+tiptap-commands@^1.10.5, tiptap-commands@^1.10.6:
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.6.tgz#46f972aacbc8d175248ab7ed7e6183ebc6cc72ed"
+  integrity sha512-62GrTo3Mmev3AmN0rFDa0gzUFQyN9yTjpuH6xMTo0OqMx6iTluqxdiROB2Hc+9qVCHj6qFwJIG4t8jPrYiuKuw==
   dependencies:
     prosemirror-commands "^1.0.8"
     prosemirror-inputrules "^1.0.4"
     prosemirror-model "^1.7.0"
     prosemirror-schema-list "^1.0.3"
     prosemirror-state "^1.2.3"
-    prosemirror-tables "^0.8.0"
-    prosemirror-utils "^0.8.2"
-    tiptap-utils "^1.5.3"
+    prosemirror-tables "^0.8.1"
+    prosemirror-utils "^0.9.0"
+    tiptap-utils "^1.5.4"
 
-tiptap-extensions@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.20.1.tgz#fee879f27d2016176dda57d7d0ecef0e457ad3bf"
-  integrity sha512-YyWKvZe6AMU6PeyKWqHg545/8OYbNWYOWmnDm3DWhQICBOnx0Oj7rYnuXyfDFLPeqD38KtSlDXGOvcpzENygXg==
+tiptap-extensions@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.20.2.tgz#820c8b1c0c3d2f2176a634c428c22b425f7bbc5f"
+  integrity sha512-DG5ba2DRKJS11T9B8RMtR/YMkU0PNM25pgDVJ/9MRWBFdD6WFZjyi+fEB9u0uaXRlnyJnYUiV3BScj97UsWl0g==
   dependencies:
     lowlight "^1.12.1"
-    prosemirror-collab "^1.1.1"
+    prosemirror-collab "^1.1.2"
     prosemirror-history "^1.0.4"
     prosemirror-model "^1.7.0"
     prosemirror-state "^1.2.3"
-    prosemirror-tables "^0.8.0"
+    prosemirror-tables "^0.8.1"
     prosemirror-transform "^1.1.3"
-    prosemirror-utils "^0.8.2"
-    prosemirror-view "^1.9.6"
-    tiptap "^1.20.1"
-    tiptap-commands "^1.10.5"
+    prosemirror-utils "^0.9.0"
+    prosemirror-view "^1.9.8"
+    tiptap "^1.21.0"
+    tiptap-commands "^1.10.6"
 
 tiptap-utils@^1.5.3:
   version "1.5.3"
@@ -10598,7 +10603,17 @@ tiptap-utils@^1.5.3:
     prosemirror-tables "^0.8.0"
     prosemirror-utils "^0.8.2"
 
-tiptap@1.20.1, tiptap@^1.20.1:
+tiptap-utils@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.5.4.tgz#c64b65d305ee70793376c9cec1da242ebf6e1884"
+  integrity sha512-Tl74RM7HZ3v9Eut+cE3DKb+uWM6k0sGvurs9eyCgokrgYmxMMa3CzH1e2c2cmyMB4ErLiY/5v5eMgBKmIZK5Vg==
+  dependencies:
+    prosemirror-model "^1.7.0"
+    prosemirror-state "^1.2.3"
+    prosemirror-tables "^0.8.1"
+    prosemirror-utils "^0.9.0"
+
+tiptap@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.20.1.tgz#d10fd0cd73a96bbb1f2d581da02ceda38fa8695b"
   integrity sha512-uVGxPknq+cQH0G8yyCHvo8p3jPMLZMnkLeFjcrTyiY9PXl6XsSJwOjtIg4GXnIyCcfz2jWI5mhJGzCD26cdJGA==
@@ -10614,6 +10629,22 @@ tiptap@1.20.1, tiptap@^1.20.1:
     tiptap-commands "^1.10.5"
     tiptap-utils "^1.5.3"
 
+tiptap@^1.21.0:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.21.0.tgz#4d8c1365c611e41c8d4f3d7aa195ddaf891e605b"
+  integrity sha512-MoOj/8OPMlmoAotIZjAIlUZ59yMMR83xReOw2rGjqbFOooncoY1rLEBp0xz5oe5FLYqoe8dKb+kzOoFERqckVQ==
+  dependencies:
+    prosemirror-commands "^1.0.8"
+    prosemirror-dropcursor "^1.1.1"
+    prosemirror-gapcursor "^1.0.3"
+    prosemirror-inputrules "^1.0.4"
+    prosemirror-keymap "^1.0.1"
+    prosemirror-model "^1.7.0"
+    prosemirror-state "^1.2.3"
+    prosemirror-view "^1.9.8"
+    tiptap-commands "^1.10.6"
+    tiptap-utils "^1.5.4"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"