diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue
index 91038230..adf0c863 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import axios from "axios";
 import CSMCalibrationSettings from "./CSMSettingsComponents/CSMCalibrationSettings.vue";
 import miniStreamDisplay from "../../genericComponents/miniStreamDisplay.vue";
 
@@ -31,83 +30,6 @@ export default {
   components: {
     CSMCalibrationSettings,
     miniStreamDisplay
-  },
-
-  props: {
-    showExtraSettings: {
-      type: Boolean,
-      required: false,
-      default: true
-    }
-  },
-
-  data: function() {
-    return {
-      thingDescription: undefined,
-      recalibrationLinks: {},
-      isCalibrating: false,
-      dataAvailable: false
-    };
-  },
-
-  computed: {
-    thingDescriptionUri: function() {
-      return this.$store.getters["wot/thingDescription"](
-        "camera_stage_mapping"
-      );
-    }
-  },
-
-  mounted() {
-    this.updateThingDescription();
-  },
-
-  methods: {
-    updateCalibrationDataAvailability: function() {
-      if ("get_calibration" in this.recalibrationLinks) {
-        axios
-          .get(this.recalibrationLinks.get_calibration.href)
-          .then(response => {
-            if (Object.keys(response.data).length === 0) {
-              this.dataAvailable = false;
-            } else {
-              this.dataAvailable = true;
-            }
-          })
-          .catch(error => {
-            this.modalError(error); // Let mixin handle error
-          });
-      }
-    },
-
-    getCalibrationData: function() {
-      axios
-        .get(this.recalibrationLinks.get_calibration.href)
-        .then(response => {
-          if (response.data != {}) {
-            const data = JSON.stringify(response.data);
-            const url = window.URL.createObjectURL(new Blob([data]));
-            const link = document.createElement("a");
-            link.href = url;
-            link.setAttribute("download", "csm_calibration.json");
-            document.body.appendChild(link);
-            link.click();
-          }
-        })
-        .catch(error => {
-          this.modalError(error); // Let mixin handle error
-        });
-    },
-
-    onRecalibrateResponse: function() {
-      this.modalNotify("Finished stage-to-camera calibration.");
-      // Update local settings
-      this.updateSettings();
-    },
-
-    onRecalibrateError: function(error) {
-      this.modalError(error); // Let mixin handle error
-    }
   }
 };
 </script>
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
index 3fc6d965..bffb62ed 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
@@ -47,24 +47,17 @@ export default {
     }
   },
 
-  data: function() {
-    return {
-      settings: null,
-      actions: {},
-      properties: {}
-    };
-  },
-
   computed: {
-    thingUri: function() {
-      return `${this.$store.getters.baseUri}/camera_stage_mapping/`;
+    actions() {
+      return this.$store.getters["wot/thingDescription"]("camera_stage_mapping")
+        .actions;
+    },
+    properties() {
+      return this.$store.getters["wot/thingDescription"]("camera_stage_mapping")
+        .properties;
     }
   },
 
-  mounted() {
-    this.updateActions();
-  },
-
   methods: {
     getCalibrationData: async function() {
       try {
@@ -84,16 +77,6 @@ export default {
       }
     },
 
-    updateActions: async function() {
-      try {
-        let response = await axios.get(this.thingUri); // Get Thing Description
-        this.actions = response.data.actions;
-        this.properties = response.data.properties;
-      } catch (error) {
-        this.modalError(error); // Let mixin handle error
-      }
-    },
-
     onRecalibrateResponse: function() {
       this.modalNotify("Finished stage-to-camera calibration.");
     }