diff --git a/frontend/src/components/NewDashboard.js b/frontend/src/components/NewDashboard.js
index d09ab3ab..6d74a3f5 100644
--- a/frontend/src/components/NewDashboard.js
+++ b/frontend/src/components/NewDashboard.js
@@ -61,15 +61,12 @@ const NewDashboard = (props) => {
     subscriptions.subscriptionsCache.isLoading,
   ]);
 
-  // console.log("selectedItems", newDashboardForm.s);
-
   const filterFn = (item, inputValue) =>
     item.subscription_type_id === "ethereum_blockchain" &&
     (!inputValue ||
       item.address.toUpperCase().includes(inputValue.toUpperCase()) ||
       item.label.toUpperCase().includes(inputValue.toUpperCase()));
 
-  console.log("ui.newDashBoardForm", newDashboardForm);
   return (
     <>
       <Stack spacing="24px">
@@ -142,11 +139,9 @@ const NewDashboard = (props) => {
                                 // selectedItem,
                                 getRootProps,
                               }) => {
-                                console.log("subscibedItem:", subscibedItem);
                                 const labelColor =
                                   subscibedItem.color &&
                                   color(`${subscibedItem.color}`);
-                                console.log("inputValue:", inputValue);
                                 return (
                                   <Box pos="relative">
                                     <Box
@@ -252,15 +247,7 @@ const NewDashboard = (props) => {
                                               const badgeColor = color(
                                                 `${item.color}`
                                               );
-                                              // badgeColor.setbadgeColor.isDark()
-                                              //   ? badgeColor.lighten(0.5)
-                                              //   : badgeColor.darken(0.5);
-                                              // console.log(
-                                              //   "original color",
-                                              //   item.color,
-                                              //   "modified:",
-                                              //   badgeColor.hex()
-                                              // );
+
                                               return (
                                                 <Stack
                                                   px={4}
@@ -391,7 +378,6 @@ const NewDashboard = (props) => {
                               ...newDashboardForm?.subscriptions,
                             ];
                             hardcopy.splice(idx, 1);
-                            console.log("index", idx, hardcopy);
                             setNewDashboardForm((prevState) => {
                               return {
                                 ...prevState,
diff --git a/frontend/src/core/providers/OverlayProvider/index.js b/frontend/src/core/providers/OverlayProvider/index.js
index 25645b44..e3684a07 100644
--- a/frontend/src/core/providers/OverlayProvider/index.js
+++ b/frontend/src/core/providers/OverlayProvider/index.js
@@ -49,16 +49,10 @@ const OverlayProvider = ({ children }) => {
   const modalDisclosure = useDisclosure();
   const alertDisclosure = useDisclosure();
 
-  // TODO @Peersky: This is written to take Disclosure state and modify modal state
-  // This should be written same as Drawer - Take modal state and modify Disclosure
-  // However to implement this - first SIGNUP,FORGOT,HUBSPOT components should be written to support this
   useLayoutEffect(() => {
     if (modal === MODAL_TYPES.OFF && modalDisclosure.isOpen) {
-      // toggleModal(MODAL_TYPES.NEW_SUBSCRIPTON);
-      console.log("thats unexpected");
       modalDisclosure.onClose();
     } else if (modal !== MODAL_TYPES.OFF && !modalDisclosure.isOpen) {
-      // toggleModal(MODAL_TYPES.OFF);
       modalDisclosure.onOpen();
     }
   }, [modal, modalDisclosure]);
@@ -81,11 +75,9 @@ const OverlayProvider = ({ children }) => {
     alertDisclosure.onOpen();
   };
 
-  console.log("drawer", drawer);
   console.assert(
     Object.values(DRAWER_TYPES).some((element) => element === drawer)
   );
-  console.log("modal", modal);
   console.assert(
     Object.values(MODAL_TYPES).some((element) => element === modal)
   );
@@ -224,6 +216,7 @@ const OverlayProvider = ({ children }) => {
             <Button
               colorScheme="blue"
               onClick={() => {
+                //TODO: @Peersky Implement logic part
                 console.log("submit clicked");
               }}
             >