diff --git a/main.py b/main.py
index 3a6665f..e5a85d1 100755
--- a/main.py
+++ b/main.py
@@ -35,10 +35,7 @@ BASE_DIR = config("BASE_DIR")
 
 FILE_PREFIX = config("FILE_PREFIX")
 
-# TODO: Remove timeout, use certificate authentication
-etcd_client = Etcd3Wrapper(host=config("ETCD_URL"), user="root",
-                           password=config("ETCD_PASSWORD"),
-                           timeout=2629746)
+etcd_client = Etcd3Wrapper(host=config("ETCD_URL"))
 
 # Recursively Get All Files and Folder below BASE_DIR
 files = glob.glob(f"{BASE_DIR}/**", recursive=True)