diff --git a/compose.yml b/compose.yml
index 49d0ca8..0181986 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,9 +6,6 @@ services:
     image: postgres:9.6-alpine
     networks: &internalNetwork
       - internal_network
-    # Note(decentral1se): get this working, failing somehow so far
-    # healthcheck:
-    #   test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
     volumes:
       - postgres:/var/lib/postgresql/data
     secrets:
@@ -35,13 +32,6 @@ services:
       - "bootstrap.memory_lock=true"
     networks:
       - internal_network
-    # Note(decentral1se): get this working, failing somehow so far
-    # healthcheck:
-    #   test:
-    #     [
-    #       "CMD-SHELL",
-    #       "curl --silent --fail localhost:9200/_cluster/health || exit 1",
-    #     ]
     volumes:
       - es:/usr/share/elasticsearch/data
     ulimits:
@@ -55,13 +45,6 @@ services:
     networks: &bothNetworks
       - proxy
       - internal_network
-    # Note(decentral1se): get this working, failing somehow so far
-    # healthcheck:
-    #   test:
-    #     [
-    #       "CMD-SHELL",
-    #       "wget -q --spider --proxy=off localhost:3000/health || exit 1",
-    #     ]
     deploy:
       update_config:
         failure_action: rollback
@@ -73,19 +56,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        # WEB_DOMAIN redirect
-        #- "traefik.http.routers.${STACK_NAME}_web.rule=(Host(`${DOMAIN}`) || (Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/webfinger`)))"
-        # - "traefik.http.middlewares.mastodon-webfinger.redirectregex.regex=^https?://${LOCAL_DOMAIN}/.*" #^(http|https)://${LOCAL_DOMAIN}/.well-known/webfinger"
-        # # - "traefik.http.middlewares.mastodon-webfinger.redirectregex.permanent=true"
-        # - "traefik.http.middlewares.mastodon-webfinger.redirectregex.replacement=https://${WEB_DOMAIN}/.well-known/webfinger"
-        # - "traefik.http.routers.${STACK_NAME}_hack.rule=(Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/`))"
-        # - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure"
-        # - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker"
-        ## Redirect from EXTRA_DOMAINS to DOMAIN
-        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-
     configs: &configs
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
@@ -217,13 +187,6 @@ services:
     entrypoint: *entrypoint
     secrets: *secrets
     networks: *bothNetworks
-    # Note(decentral1se): get this working, failing somehow so far
-    # healthcheck:
-    #   test:
-    #     [
-    #       "CMD-SHELL",
-    #       "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1",
-    #     ]
     deploy:
       update_config:
         failure_action: rollback
@@ -235,11 +198,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}_streaming.rule=(Host(`${DOMAIN}`) && PathPrefix(`/api/v1/streaming`))"
         - "traefik.http.routers.${STACK_NAME}_streaming.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_streaming.tls.certresolver=${LETS_ENCRYPT_ENV}"
-
-        ## Redirect from EXTRA_DOMAINS to DOMAIN
-        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
     environment: *env
     volumes: *appVolume # used to make sure this volume is created