diff --git a/code/iottb/subcommands/add_device.py b/code/iottb/subcommands/add_device.py
index b919215..05f0be6 100644
--- a/code/iottb/subcommands/add_device.py
+++ b/code/iottb/subcommands/add_device.py
@@ -2,12 +2,12 @@ import logging
 import pathlib
 
 from iottb import definitions
-from iottb.definitions import DEVICE_METADATA_FILE
+from iottb.definitions import DEVICE_METADATA_FILE, ReturnCodes
 from iottb.logger import logger
 from iottb.models.device_metadata_model import DeviceMetadata
-from archive.device_metadata_utils import *
 
-logger.setLevel(logging.INFO) # Since module currently passes all tests
+logger.setLevel(logging.INFO)  # Since module currently passes all tests
+
 
 def setup_init_device_root_parser(subparsers):
     parser = subparsers.add_parser('add-device', aliases=['add-device-root', 'add'])
@@ -21,7 +21,8 @@ def setup_init_device_root_parser(subparsers):
 def handle_add(args):
     logger.info(f'Add device handler called with args {args}')
 
-    args.root_dir.mkdir(parents=True, exist_ok=True)  # else metadata.save_to_file will fail TODO: unclear what to assume
+    args.root_dir.mkdir(parents=True,
+                        exist_ok=True)  # else metadata.save_to_file will fail TODO: unclear what to assume
 
     if args.guided:
         logger.debug('begin guided setup')
@@ -72,4 +73,3 @@ def guided_setup(device_root) -> DeviceMetadata:
         logger.debug(f'Device name is {device_name}')
 
     return DeviceMetadata(device_name, device_root)
-