diff --git a/config.dist.yml b/config.dist.yml
index 6270db8..ef890c7 100644
--- a/config.dist.yml
+++ b/config.dist.yml
@@ -4,16 +4,6 @@ server:
   host: localhost
   port: 80
 
-# Worker listen to AMQP events, so it should know how to connect to any
-# AMQP provider (actually RabbitMQ). You should not escape any vhost
-# characters, 'cause it will be done by application automatically
-amqp:
-  host: localhost
-  port: 5672
-  username: amqp-user
-  password: amqp-password
-  vhost: /
-
 # Both of web or worker depends on storage.
 storage:
   # For now app require Redis and don't support any other backends to store
@@ -32,16 +22,6 @@ storage:
     basePath: data
     capesDirName: capes
 
-# Accounts Ely.by internal API will be used in cases, when by some reasons
-# information about user will be unavailable in the app storage.
-api:
-  accounts:
-    host: https://account.ely.by
-    id: app-id
-    secret: secret
-    scopes:
-      - internal_account_info
-
 # StatsD can be used to collect metrics
 # statsd:
 #   addr: localhost:3746
diff --git a/docker/config.dist.yml b/docker/config.dist.yml
index 8045c06..2827222 100644
--- a/docker/config.dist.yml
+++ b/docker/config.dist.yml
@@ -4,16 +4,6 @@ server:
   host: # leave host empty to allow Docker publish port
   port: 80
 
-# Worker listen to AMQP events, so it should know how to connect to any
-# AMQP provider (actually RabbitMQ). You should not escape any vhost
-# characters, 'cause it will be done by application automatically
-amqp:
-  host: rabbitmq
-  port: 5672
-  username: minecraft-skinsystem-app
-  password: minecraft-skinsystem-app-password
-  vhost: /
-
 # Both of web or worker depends on storage.
 storage:
   # For now app require Redis and don't support any other backends to store
@@ -32,16 +22,6 @@ storage:
     basePath: /data
     capesDirName: capes
 
-# Accounts Ely.by internal API will be used in cases, when by some reasons
-# information about user will be unavailable in the app storage.
-api:
-  accounts:
-    host: https://account.ely.by
-    id: app-id
-    secret: secret
-    scopes:
-      - internal_account_info
-
 # StatsD can be used to collect metrics
 # statsd:
 #   addr: localhost:3746
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 8b6c29f..1533b4b 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -10,13 +10,6 @@
 #    docker-compose up -d
 #
 # 3. Pass to the project configuration links to this services:
-#    amqp:
-#      host: localhost
-#      port: 5672
-#      username: ely
-#      password: ely
-#      vhost: /ely
-#
 #    storage:
 #      redis:
 #        host: localhost
@@ -34,13 +27,3 @@ services:
       - "6379:6379"
     volumes:
       - ./data/redis:/data
-
-  rabbitmq:
-    image: rabbitmq:3.6-management-alpine
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    environment:
-      RABBITMQ_DEFAULT_USER: "ely"
-      RABBITMQ_DEFAULT_PASS: "ely"
-      RABBITMQ_DEFAULT_VHOST: "/ely"
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 54b4512..a94f397 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -11,26 +11,8 @@ services:
       - ./data/capes:/data/capes
       - ./config/minecraft-skinsystem:/etc/minecraft-skinsystem
 
-  worker:
-    image: registry.ely.by/elyby/skinsystem:latest
-    restart: always
-    links:
-      - redis
-      - rabbitmq
-    command: ["amqp-worker"]
-    volumes:
-      - ./config/minecraft-skinsystem:/etc/minecraft-skinsystem
-
   redis:
     image: redis:3.2-32bit # 32-bit version used to decrease memory usage
     restart: always
     volumes:
       - ./data/redis:/data
-
-  rabbitmq:
-    image: rabbitmq:3.6-alpine
-    restart: always
-    environment:
-      RABBITMQ_DEFAULT_USER: minecraft-skinsystem-app
-      RABBITMQ_DEFAULT_PASS: minecraft-skinsystem-app-password
-      RABBITMQ_DEFAULT_VHOST: /
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 54c11ea..9382f91 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -8,7 +8,7 @@ if [ ! -f "$CONFIG" ]; then
     cp /usr/local/etc/minecraft-skinsystem/config.dist.yml "$CONFIG"
 fi
 
-if [ "$1" = "serve" ] || [ "$1" = "amqp-worker" ]; then
+if [ "$1" = "serve" ] || [ "$1" = "token" ] || [ "$1" = "version" ]; then
     set -- minecraft-skinsystem "$@"
 fi