diff --git a/src/Common/EmptyState/EmptyState.tsx b/src/Common/EmptyState/EmptyState.tsx
deleted file mode 100644
index d30d1b0d6..000000000
--- a/src/Common/EmptyState/EmptyState.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react'
-import { ReactComponent as Progressing } from '../../Assets/Icon/ic-progressing.svg'
-
-/**
- * @deprecated
- * @description Trying to deprecate this component instead, use GenericEmptyState
- */
-const EmptyState = ({ children, className = '' }) => (
-    <div className={`flex column empty-state w-100 h-100 ${className}`}>{children}</div>
-)
-
-function Image({ children }) {
-    return children
-}
-
-function Title({ children }) {
-    return children
-}
-
-const Subtitle = ({ children, className }: { children: any; className?: string }) => (
-    <p className={`subtitle ${className || ''}`}>{children}</p>
-)
-
-function Button({ children }) {
-    return children
-}
-
-const Loading: React.FC<{ text: string }> = (props) => (
-    <>
-        <Progressing className="dc__block empty-state__loader" />
-        <p className="empty-state__loading-text">{props.text}</p>
-    </>
-)
-
-EmptyState.Image = Image
-EmptyState.Title = Title
-EmptyState.Subtitle = Subtitle
-EmptyState.Button = Button
-EmptyState.Loading = Loading
-
-export default EmptyState
diff --git a/src/Common/Error.tsx b/src/Common/Error.tsx
index f30cf06b3..0d4781cf0 100644
--- a/src/Common/Error.tsx
+++ b/src/Common/Error.tsx
@@ -1,5 +1,4 @@
 import React, { Component } from 'react'
-import EmptyState from './EmptyState/EmptyState'
 import notAuthorized from '../Assets/Img/ic-not-authorized.svg'
 import ErrorScreenNotFound from './ErrorScreenNotFound'
 import { ERROR_EMPTY_SCREEN } from './Constants'
diff --git a/src/Common/Select/Select.tsx b/src/Common/Select/Select.tsx
index 5b6fce82f..2df51f56b 100644
--- a/src/Common/Select/Select.tsx
+++ b/src/Common/Select/Select.tsx
@@ -5,7 +5,7 @@ import { SelectComposition, SelectProps, OptionGroupProps, SelectAsync } from '.
 
 import arrowTriangle from '../../Assets/Icon/ic-chevron-down.svg' // '../../../assets/icons/ic-chevron-down.svg'
 
-import './select.css'
+import './select.scss'
 import PopupMenu from '../PopupMenu'
 import { showError } from '../Helper'
 
diff --git a/src/Common/Select/select.css b/src/Common/Select/select.scss
similarity index 100%
rename from src/Common/Select/select.css
rename to src/Common/Select/select.scss
diff --git a/src/Common/index.ts b/src/Common/index.ts
index 77934e3f0..70147aecc 100644
--- a/src/Common/index.ts
+++ b/src/Common/index.ts
@@ -23,7 +23,6 @@ export * from './MultiSelectCustomization'
 export { default as InfoColourBar } from './InfoColorBar/InfoColourbar'
 export * from './Common.service'
 export * from './Checkbox'
-export { default as EmptyState } from './EmptyState/EmptyState'
 export { default as GenericEmptyState } from './EmptyState/GenericEmptyState'
 export * from './SearchBar'
 export { default as Toggle } from './Toggle/Toggle'
diff --git a/vite.config.ts b/vite.config.ts
index 1d8b536fd..a87349564 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -31,20 +31,7 @@ export default defineConfig({
     },
     rollupOptions: {
       external: [...Object.keys(packageJson.peerDependencies)],
-      input: Object.fromEntries(
-        // https://rollupjs.org/configuration-options/#input
-        glob.sync('src/**/!(*.d).{ts,tsx}').map(file => [
-          // 1. The name of the entry point
-          // lib/nested/foo.js becomes nested/foo
-          relative(
-            'src',
-            file.slice(0, file.length - extname(file).length)
-          ),
-          // 2. The absolute path to the entry file
-          // lib/nested/foo.ts becomes /project/lib/nested/foo.ts
-          fileURLToPath(new URL(file, import.meta.url))
-        ])
-      ),
+      input: './src/index.ts',
       output: {
         assetFileNames: 'assets/[name][extname]',
         entryFileNames: '[name].js',
@@ -52,5 +39,3 @@ export default defineConfig({
     }
   }
 })
-
-