diff --git a/package.json b/package.json
index 8329a0739..4e94eab64 100644
--- a/package.json
+++ b/package.json
@@ -5,24 +5,18 @@
   "author": "Shiva Nandan <shiva.nandan@juspay.in>",
   "license": "MIT",
   "scripts": {
+    "setup-env": "chmod +x ./replace_env.sh && ./replace_env.sh",
     "pre-commit": "bash .githooks/commit-msg",
-    "start": "chmod +x ./replace_env.sh && ./replace_env.sh && cp env-config.js ./public/hyperswitch && APP_VERSION=$npm_package_version && appName=hyperswitch webpack serve --config webpack.dev.js",
-    "start:server_compiler": "webpack --config webpack.server.js --watch",
+    "start": "npm run setup-env && cp env-config.js ./public/hyperswitch && APP_VERSION=$npm_package_version && appName=hyperswitch webpack serve --config webpack.dev.js",
+    "serve": "npm run setup-env && cp env-config.js ./dist/hyperswitch && node dist/server/server.js",
     "prod:start": "webpack serve --config webpack.dev.js",
-    "build:prod": "chmod +x ./replace_env.sh && ./replace_env.sh && cp env-config.js ./public/hyperswitch && APP_VERSION=$npm_package_version && webpack --config webpack.prod.js",
-    "ssr_sript_build": "BRANCH_NAME=ssr webpack --config webpack.prod.js",
-    "ssr_run_server": "node --watch dist/server/server.js",
     "build:netlify": "webpack --config webpack.prod.js --env netlifyHosted",
+    "build:test": "cd tests && npx rescript build -with-deps",
+    "build:prod": "npm run setup-env && cp env-config.js ./public/hyperswitch && APP_VERSION=$npm_package_version && webpack --config webpack.prod.js",
     "re:build": "rescript",
     "re:clean": "rescript clean",
     "re:start": "rescript build -w",
     "re:format": "rescript format -all",
-    "use-prod-ec": "mv public/_redirects_for_prod public/_redirects",
-    "serve": "chmod +x ./replace_env.sh && ./replace_env.sh && cp env-config.js ./dist/hyperswitch && node dist/server/server.js",
-    "build:test": "cd tests && npx rescript build -with-deps",
-    "clean:test": "cd tests && npx rescript clean -with-deps",
-    "unit:test": "cd tests && npx rescript build -with-deps && jest unit_test",
-    "revert:test": "cd tests && npx rescript clean -with-deps && cd .. && npx rescript build -with-deps",
     "postinstall": "git config core.hooksPath .githooks && chmod +x .githooks/commit-msg"
   },
   "husky": {
diff --git a/src/components/LoadedTable.res b/src/components/LoadedTable.res
index e7380840a..06ba7fd10 100644
--- a/src/components/LoadedTable.res
+++ b/src/components/LoadedTable.res
@@ -774,7 +774,7 @@ let make = (
         ? ""
         : `${isMinHeightRequired ? noScrollbar ? "" : "overflow-x-scroll" : "overflow-scroll"}`
     let loadedTable =
-      <div className={`no-scrollbar ${scrollBarClass} no-scrollbar`}>
+      <div className={`no-scrollbar ${scrollBarClass}`}>
         {switch dataView {
         | Table => {
             let children =
diff --git a/src/components/Loader.res b/src/components/Loader.res
index 5ed36be52..cbf78e93b 100644
--- a/src/components/Loader.res
+++ b/src/components/Loader.res
@@ -25,20 +25,19 @@ let make = (
       <div className={`${animationType} mb-10`}>
         <Icon name="spinner" size customIconColor=customSpinnerIconColor />
       </div>
-      {React.string(loadingText)}
       {children}
     </div>
 
   <div className="flex flex-col">
     <div className="w-full flex justify-center py-10">
       <div className="w-20 h-16">
-        <div className="scale-400 pt-px">
-          <React.Suspense fallback={loader}>
-            <ErrorBoundary>
+        <React.Suspense fallback={loader}>
+          <ErrorBoundary>
+            <div className="scale-400 pt-px">
               <Lottie animationData={loaderLottieFile} autoplay=true loop=true />
-            </ErrorBoundary>
-          </React.Suspense>
-        </div>
+            </div>
+          </ErrorBoundary>
+        </React.Suspense>
       </div>
     </div>
   </div>
diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
index 40bfc27a9..ba84d8950 100644
--- a/src/entryPoints/hyperswitch/HyperSwitchApp.res
+++ b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -229,7 +229,7 @@ let make = () => {
                   </div>
                 </div>
                 <div
-                  className="w-full h-screen overflow-x-scroll xl:overflow-x-hidden overflow-y-scroll ">
+                  className="w-full h-screen overflow-x-scroll xl:overflow-x-hidden overflow-y-scroll">
                   <div
                     className="w-full h-full max-w-fixedPageWidth p-6 md:px-16 md:pb-16 pt-[3rem] overflow-scroll md:overflow-y-scroll md:overflow-x-hidden flex flex-col gap-10">
                     <ErrorBoundary>
diff --git a/tests/bsconfig.json b/tests/bsconfig.json
deleted file mode 100644
index a0c7873e6..000000000
--- a/tests/bsconfig.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "editor-ui",
-  "jsx": {
-    "version": 4,
-    "mode": "classic"
-  },
-  "bsc-flags": ["-bs-super-errors"],
-  "sources": [
-    {
-      "dir": "../src",
-      "subdirs": true
-    },
-    {
-      "dir": "../tests",
-      "subdirs": true,
-      "type": "dev"
-    }
-  ],
-  "suffix": ".bs.js",
-  "namespace": true,
-  "ppx-flags": [],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "bs-dev-dependencies": ["@glennsl/rescript-jest"],
-  "bs-dependencies": [
-    "@rescript/react",
-    "rescript-webapi",
-    "bs-fetch",
-    "@ryyppy/rescript-promise",
-    "rescript-debounce-react"
-  ]
-}
diff --git a/tests/marketplace/unit_test/InitTest.res b/tests/marketplace/unit_test/InitTest.res
deleted file mode 100644
index 76f513b3d..000000000
--- a/tests/marketplace/unit_test/InitTest.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Jest
-open Expect
-
-let () = {
-  describe("Test", () => {
-    let expectedValue = "test"
-    let actualValue = "test"
-
-    test("Test", () => {
-      expect(actualValue)->toEqual(expectedValue)
-    })
-  })
-}
diff --git a/webpack.common.js b/webpack.common.js
index 687b6dd56..966c1a507 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -6,23 +6,10 @@ const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin"
 const tailwindcss = require("tailwindcss");
 const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
-const appEntryPoint = {
-  hyperswitch: "hyperswitch/HyperSwitchEntry",
-};
-
-function getAppEntryPoint(appName) {
-  const path = appEntryPoint[appName];
-  if (path) {
-    return `./src/entryPoints/${path}.bs.js`;
-  } else {
-    return undefined;
-  }
-}
-
 module.exports = (appName = "hyperswitch", publicPath = "auto") => {
   const isDevelopment = process.env.NODE_ENV !== "production";
   let entryObj = {
-    app: getAppEntryPoint(appName),
+    app: `./src/entryPoints/hyperswitch/HyperSwitchEntry.bs.js`,
   };
   return {
     entry: entryObj,