diff --git a/cleaning/drop-remove-expired-files.service b/cleaning/drop-remove-expired-files.service
new file mode 100644
index 0000000..7a38158
--- /dev/null
+++ b/cleaning/drop-remove-expired-files.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=drop
+After=network.target
+
+[Service]
+Type=simple
+User=app
+WorkingDirectory=/srv/drop/www
+ExecStart=python3 /srv/drop.chapril.org/tools/cleaning/remove_expired_files.py
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/cleaning/remove_expired_files.py b/cleaning/remove_expired_files.py
new file mode 100644
index 0000000..e0602ea
--- /dev/null
+++ b/cleaning/remove_expired_files.py
@@ -0,0 +1,104 @@
+import logging
+import argparse
+import os
+import re
+
+import redis
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-v", "--verbose", action="store_true",
+                        help="increase output verbosity")
+    parser.add_argument("-r", "--redis-host", default="127.0.0.1",
+                        help="specify redis host")
+    parser.add_argument("-f", "--file-dir", default="/var/drop/files",
+                        help="specify dir where files are stored")
+    parser.add_argument("-d", "--dry", action="store_true",
+                        help="Run in dry mode")
+    return parser.parse_args()
+
+
+def convert_bytes_to_string(bytes_or_string):
+    if isinstance(bytes_or_string, str):
+        return bytes_or_string
+
+    if isinstance(bytes_or_string, bytes):
+        return bytes_or_string.decode('UTF-8')
+
+    return None
+
+
+def configure_logging(args):
+    log_level = logging.INFO
+
+    if args.verbose:
+        log_level = logging.DEBUG
+
+    logging.basicConfig(level=log_level)
+
+
+def create_redis_client(args):
+    logging.debug('Connecting to redist host %s...', args.redis_host)
+    redis_client = redis.StrictRedis(host=args.redis_host)
+    logging.debug('Subscribing to events...')
+    pubsub = redis_client.pubsub()
+    pubsub.psubscribe("*")
+    return redis_client, pubsub
+
+
+def locate_file_with_id(args, file_id):
+
+    for file in os.listdir(args.file_dir):
+
+        if re.match(r'^[0-9]+-' + file_id + r'$', file):
+            return os.path.join(args.file_dir, file)
+
+    return None
+
+
+def delete_file(args, file_id):
+    logging.info('File with id %s will be deleted', file_id)
+
+    if not re.match(r'^[a-f0-9]{16}$', file_id):
+        logging.warning('file id %s is not valid', file_id)
+        return
+
+    file_path = locate_file_with_id(args, file_id)
+
+    if not file_path:
+        logging.warning('file with id %s was no found', file_id)
+        return
+
+    logging.info('Removing file with id %s on disk', file_id)
+
+    if not args.dry:
+        os.remove(file_path)
+
+
+def main():
+    args = parse_args()
+
+    configure_logging(args)
+    redis_client, pubsub = create_redis_client(args)
+
+    logging.debug('Listen to messages...')
+
+    for msg in pubsub.listen():
+        msg_type = msg.get('type', None)
+        channel = convert_bytes_to_string(msg.get('channel', None))
+        data = convert_bytes_to_string(msg.get('data', None))
+
+        if msg_type != 'pmessage':
+            logging.debug('Message of type %s ignored', msg_type)
+            continue
+
+        if channel != '__keyevent@0__:expired':
+            logging.debug('Event of type %s ignored', channel)
+            continue
+
+        delete_file(args, data)
+
+
+if __name__ == "__main__":
+    main()