diff --git a/code/iottb/models/capture_metadata_model.py b/code/iottb/models/capture_metadata_model.py
index e605bc1..4f11325 100644
--- a/code/iottb/models/capture_metadata_model.py
+++ b/code/iottb/models/capture_metadata_model.py
@@ -47,7 +47,7 @@ class CaptureMetadata:
         logger.info(f"Building capture file name")
         if self.app is None:
             logger.debug(f"No app specified")
-            prefix = self.device_metadata.get_device_short_name()
+            prefix = self.device_metadata.device_short_name
         else:
             logger.debug(f"App specified: {self.app}")
             assert str(self.app).strip() not in {"", " "}, f"app is not a valid name: {self.app}"
diff --git a/code/iottb/models/device_metadata_model.py b/code/iottb/models/device_metadata_model.py
index eabe874..2359e4b 100644
--- a/code/iottb/models/device_metadata_model.py
+++ b/code/iottb/models/device_metadata_model.py
@@ -40,50 +40,6 @@ class DeviceMetadata:
         logger.debug(f"Device root dir: {device_root_dir}")
         logger.info(f"Initialized DeviceMetadata model: {device_name}")
 
-    def get_device_id(self) -> str:
-        return self.device_id
-
-    def get_device_name(self) -> str:
-        return self.device_name
-
-    def get_device_short_name(self) -> str:
-        return self.device_short_name
-
-    def get_device_type(self) -> str:
-        return self.device_type
-
-    def get_device_serial_number(self) -> str:
-        return self.device_serial_number
-
-    def get_device_firmware_version(self) -> str:
-        return self.device_firmware_version
-
-    def get_date_updated(self) -> str:
-        return self.date_updated
-
-    def get_capture_files(self) -> List[str]:
-        return self.capture_files
-
-    def get_aliases(self) -> List[str]:
-        return self.aliases
-
-    def set_device_type(self, device_type: str) -> None:
-        self.device_type = device_type
-        self.date_updated = datetime.now().strftime('%d-%m-%YT%H:%M:%S')
-
-    def set_device_serial_number(self, device_serial_number: str) -> None:
-        self.device_serial_number = device_serial_number
-        self.date_updated = datetime.now().strftime('%d-%m-%YT%H:%M:%S')
-
-    def set_device_firmware_version(self, device_firmware_version: str) -> None:
-        self.device_firmware_version = device_firmware_version
-        self.date_updated = datetime.now().strftime('%d-%m-%YT%H:%M:%S')
-
-    def set_device_name(self, device_name: str) -> None:
-        self.device_name = device_name
-        self.device_short_name = device_name.lower().replace(" ", "_")
-        self.date_updated = datetime.now().strftime('%d-%m-%YT%H:%M:%S')
-
     @classmethod
     def load_from_json(cls, device_file_path: Path):
         logger.info(f"Loading DeviceMetadata from JSON file: {device_file_path}")