diff --git a/app/src/content.js b/app/src/content.js
index 25e7343..5924824 100644
--- a/app/src/content.js
+++ b/app/src/content.js
@@ -8,8 +8,8 @@
 let targetElemt = null;
 let enablegcx = false;
 let isRecordEnabled = false;
-let attachedTabs = {};
-let version = "1.3";
+// let attachedTabs = {};
+// let version = "1.3";
 
 // used to send/receive message with in extension
 let receiver = (message, sender, sendResponse) => {
@@ -121,8 +121,6 @@ function buildSelectedFileds(targetElement) {
         try {
             maxIndex = tempMaxIndex != null ? tempMaxIndex : 5;
             buildXpath(targetElement, 0);
-
-
         } catch (error) {
             if (error.message === 'shadow dom not yet supported')
                 XPATHDATA = undefined
diff --git a/panel/panel.js b/panel/panel.js
index 83e2ce1..6c14874 100644
--- a/panel/panel.js
+++ b/panel/panel.js
@@ -1,6 +1,4 @@
 chrome.runtime.onMessage.addListener((req, rec, res) => {
-  console.log(req);
-
   switch (req.request) {
     case "send_to_dev":
       buildUI(req);
@@ -18,7 +16,7 @@ chrome.runtime.onMessage.addListener((req, rec, res) => {
   }
 })
 let devtools_connections = chrome.runtime.connect({ name: "ortoni_devtools_message" });
-
+// generate axes based on user inputs
 function generateAxes(req) {
   jQuery("#anchorXPath").empty();
   let ui = `
@@ -51,6 +49,7 @@ function generateAxes(req) {
   jQuery("#anchorXPath").append(ui);
   jQuery("#anchorXPath").trigger('custom-update');
 }
+// Build the source element
 function sourceElement(element) {
   let ui = '';
   for (let i = 0; i < element.length; i++) {
@@ -72,6 +71,7 @@ function sourceElement(element) {
   }
   return ui;
 }
+// Build the target element
 function targetElement(element) {
   let ui = '';
   for (let i = 0; i < element.length; i++) {
@@ -93,8 +93,6 @@ function targetElement(element) {
   }
   return ui;
 }
-
-
 // -------- based on the snippet type show the code ----------
 function buildUI(data) {
   jQuery("#addXPath").empty();
diff --git a/panelconfig.js b/panelconfig.js
index 1e26fab..b1b346f 100644
--- a/panelconfig.js
+++ b/panelconfig.js
@@ -59,20 +59,18 @@ $(document).ready(function () {
     })
 
     // --- start debugger
-    $("#setdebugger").click(() => {
-        chrome.debugger.onEvent.addListener(onEvent);
-        chrome.debugger.onDetach.addListener(onDetach);
-        var tabId = chrome.devtools.inspectedWindow.tabId;
-        var debuggeeId = { tabId: tabId };
-
-        if (attachedTabs[tabId] == "pausing")
-            return;
-
-        if (!attachedTabs[tabId])
-            chrome.debugger.attach(debuggeeId, version, onAttach.bind(null, debuggeeId));
-        else if (attachedTabs[tabId])
-            chrome.debugger.detach(debuggeeId, onDetach.bind(null, debuggeeId));
-    });
+    // $("#setdebugger").click(() => {
+    //     chrome.debugger.onEvent.addListener(onEvent);
+    //     chrome.debugger.onDetach.addListener(onDetach);
+    //     var tabId = chrome.devtools.inspectedWindow.tabId;
+    //     var debuggeeId = { tabId: tabId };
+    //     if (attachedTabs[tabId] == "pausing")
+    //         return;
+    //     if (!attachedTabs[tabId])
+    //         chrome.debugger.attach(debuggeeId, version, onAttach.bind(null, debuggeeId));
+    //     else if (attachedTabs[tabId])
+    //         chrome.debugger.detach(debuggeeId, onDetach.bind(null, debuggeeId));
+    // });
     // --- open option page
     $('body').on('click', '#openSetting', () => {
         chrome.runtime.openOptionsPage(() => { });
@@ -97,42 +95,46 @@ $(document).ready(function () {
         } catch (error) { }
     })
 
+    /**
+     * @description - Feature is disabled as of now, as it is not working as expected
+     */
+
     // debugger
-    var attachedTabs = {};
-    var version = "1.3";
+    // var attachedTabs = {};
+    // var version = "1.3";
 
-    var onAttach = (debuggeeId) => {
-        if (chrome.runtime.lastError) {
-            // alert(chrome.runtime.lastError.message);
-            return;
-        }
-        var tabId = debuggeeId.tabId;
-        attachedTabs[tabId] = "pausing";
-        chrome.debugger.sendCommand(
-            debuggeeId, "Debugger.enable", {},
-            onDebuggerEnabled.bind(null, debuggeeId)
-        );
-    }
+    // var onAttach = (debuggeeId) => {
+    //     if (chrome.runtime.lastError) {
+    //         // alert(chrome.runtime.lastError.message);
+    //         return;
+    //     }
+    //     var tabId = debuggeeId.tabId;
+    //     attachedTabs[tabId] = "pausing";
+    //     chrome.debugger.sendCommand(
+    //         debuggeeId, "Debugger.enable", {},
+    //         onDebuggerEnabled.bind(null, debuggeeId)
+    //     );
+    // }
 
-    var onDebuggerEnabled = (debuggeeId) => {
-        chrome.debugger.sendCommand(debuggeeId, "Debugger.pause");
-        document.querySelector("#setdebugger").textContent = "Paused";
+    // var onDebuggerEnabled = (debuggeeId) => {
+    //     chrome.debugger.sendCommand(debuggeeId, "Debugger.pause");
+    //     document.querySelector("#setdebugger").textContent = "Paused";
 
-    }
+    // }
 
-    var onEvent = (debuggeeId, method, setdebugger) => {
-        var tabId = debuggeeId.tabId;
-        if (method == "Debugger.paused") {
-            attachedTabs[tabId] = "paused";
-            document.querySelector("#setdebugger").textContent = "Resume";
-        }
-    }
+    // var onEvent = (debuggeeId, method, setdebugger) => {
+    //     var tabId = debuggeeId.tabId;
+    //     if (method == "Debugger.paused") {
+    //         attachedTabs[tabId] = "paused";
+    //         document.querySelector("#setdebugger").textContent = "Resume";
+    //     }
+    // }
 
-    var onDetach = (debuggeeId) => {
-        var tabId = debuggeeId.tabId;
-        delete attachedTabs[tabId];
-        document.querySelector("#setdebugger").textContent = "Start!";
-    }
+    // var onDetach = (debuggeeId) => {
+    //     var tabId = debuggeeId.tabId;
+    //     delete attachedTabs[tabId];
+    //     document.querySelector("#setdebugger").textContent = "Start!";
+    // }
 });
 function copyToClipBoard(range, node) {
     try {
diff --git a/popup/popup.js b/popup/popup.js
deleted file mode 100644
index e69de29..0000000