diff --git a/web/src/components/MyEMS/AdvancedReporting/AdvancedReporting.js b/web/src/components/MyEMS/AdvancedReporting/AdvancedReporting.js
index d3355ccd..9b6fe9a0 100644
--- a/web/src/components/MyEMS/AdvancedReporting/AdvancedReporting.js
+++ b/web/src/components/MyEMS/AdvancedReporting/AdvancedReporting.js
@@ -13,9 +13,7 @@ import {
   Spinner
 } from 'reactstrap';
 import Summary from './Summary';
-import Loader from '../../common/Loader';
 import FalconCardHeader from '../../common/FalconCardHeader';
-import uuid from 'uuid/v1';
 import Datetime from 'react-datetime';
 import moment from 'moment';
 import createMarkup from '../../../helpers/createMarkup';
diff --git a/web/src/components/MyEMS/AdvancedReporting/Summary.js b/web/src/components/MyEMS/AdvancedReporting/Summary.js
index 9d217203..f45aa68f 100644
--- a/web/src/components/MyEMS/AdvancedReporting/Summary.js
+++ b/web/src/components/MyEMS/AdvancedReporting/Summary.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { Badge, Media } from 'reactstrap';
 import Calendar from '../../common/Calendar';
-import ButtonIcon from '../../common/ButtonIcon';
 
 const ReportBadge = ({ text, ...rest }) => <Badge {...rest}>{text}</Badge>;
 
diff --git a/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js b/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
index c2a5b1fd..288a93e5 100644
--- a/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
+++ b/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
@@ -1,16 +1,11 @@
 import React, { Component } from 'react';
-import { Line } from 'react-chartjs-2';
-import range from 'lodash/range';
 import { Card, CardHeader, CardBody, ListGroup, ListGroupItem } from 'reactstrap';
-import { rgbaColor } from '../../../helpers/utils';
 import { withTranslation } from 'react-i18next';
 import uuid from 'uuid/v1';
 import { APIBaseURL } from '../../../config';
-import { getCookieValue, createCookie } from '../../../helpers/utils';
+import { getCookieValue } from '../../../helpers/utils';
 import { toast } from 'react-toastify';
 
-
-const dividerBorder = '1px solid rgba(255, 255, 255, 0.15)';
 const listItemBorderColor = 'rgba(255, 255, 255, 0.05)';
 
 class RealtimeChart extends Component {
diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
index 3a3b10ad..90ba42b4 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Equipment/EquipmentBatch.js b/web/src/components/MyEMS/Equipment/EquipmentBatch.js
index 6ee0e0a2..978bfb0e 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentBatch.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Equipment/EquipmentTracking.js b/web/src/components/MyEMS/Equipment/EquipmentTracking.js
index e81e2be4..c375107d 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentTracking.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentTracking.js
@@ -17,7 +17,6 @@ import {
   UncontrolledDropdown,
   Spinner,
 } from 'reactstrap';
-import uuid from 'uuid/v1';
 import Cascader from 'rc-cascader';
 import loadable from '@loadable/component';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
diff --git a/web/src/components/MyEMS/KnowledgeBase/Summary.js b/web/src/components/MyEMS/KnowledgeBase/Summary.js
index 9d217203..f45aa68f 100644
--- a/web/src/components/MyEMS/KnowledgeBase/Summary.js
+++ b/web/src/components/MyEMS/KnowledgeBase/Summary.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { Badge, Media } from 'reactstrap';
 import Calendar from '../../common/Calendar';
-import ButtonIcon from '../../common/ButtonIcon';
 
 const ReportBadge = ({ text, ...rest }) => <Badge {...rest}>{text}</Badge>;
 
diff --git a/web/src/components/MyEMS/Meter/MeterBatch.js b/web/src/components/MyEMS/Meter/MeterBatch.js
index c8269388..cac47e1e 100644
--- a/web/src/components/MyEMS/Meter/MeterBatch.js
+++ b/web/src/components/MyEMS/Meter/MeterBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js
index 1b4fcd9e..cbe75898 100644
--- a/web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/web/src/components/MyEMS/Meter/MeterEnergy.js
@@ -19,7 +19,6 @@ import CountUp from 'react-countup';
 import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
-import Loader from '../../common/Loader';
 import Cascader from 'rc-cascader';
 import CardSummary from '../common/CardSummary';
 import LineChart from '../common/LineChart';
diff --git a/web/src/components/MyEMS/Meter/MeterRealtime.js b/web/src/components/MyEMS/Meter/MeterRealtime.js
index 161d9824..7944f3f6 100644
--- a/web/src/components/MyEMS/Meter/MeterRealtime.js
+++ b/web/src/components/MyEMS/Meter/MeterRealtime.js
@@ -2,8 +2,6 @@ import React, { createRef, Fragment, useEffect, useState } from 'react';
 import {
   Breadcrumb,
   BreadcrumbItem,
-  Button,
-  ButtonGroup,
   Card,
   CardBody,
   Col,
diff --git a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
index fd79dc7e..31710bfb 100644
--- a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
+++ b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
@@ -19,7 +19,6 @@ import CountUp from 'react-countup';
 import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
-import Loader from '../../common/Loader';
 import Cascader from 'rc-cascader';
 import CardSummary from '../common/CardSummary';
 import LineChart from '../common/LineChart';
diff --git a/web/src/components/MyEMS/Meter/MeterTracking.js b/web/src/components/MyEMS/Meter/MeterTracking.js
index 0d4bf626..ece8aa4b 100644
--- a/web/src/components/MyEMS/Meter/MeterTracking.js
+++ b/web/src/components/MyEMS/Meter/MeterTracking.js
@@ -19,7 +19,6 @@ import {
   UncontrolledDropdown,
   Spinner,
 } from 'reactstrap';
-import uuid from 'uuid/v1';
 import Cascader from 'rc-cascader';
 import loadable from '@loadable/component';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
index 418b9d89..851b4769 100644
--- a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
+++ b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Store/StoreBatch.js b/web/src/components/MyEMS/Store/StoreBatch.js
index ab03eac3..282ad8de 100644
--- a/web/src/components/MyEMS/Store/StoreBatch.js
+++ b/web/src/components/MyEMS/Store/StoreBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Tenant/TenantBatch.js b/web/src/components/MyEMS/Tenant/TenantBatch.js
index 8662ad0c..02804c5b 100644
--- a/web/src/components/MyEMS/Tenant/TenantBatch.js
+++ b/web/src/components/MyEMS/Tenant/TenantBatch.js
@@ -12,7 +12,6 @@ import {
   FormGroup,
   Input,
   Label,
-  CustomInput,
   Spinner,
 } from 'reactstrap';
 import Datetime from 'react-datetime';
diff --git a/web/src/components/MyEMS/Tenant/TenantBill.js b/web/src/components/MyEMS/Tenant/TenantBill.js
index bf20219d..ea02add4 100644
--- a/web/src/components/MyEMS/Tenant/TenantBill.js
+++ b/web/src/components/MyEMS/Tenant/TenantBill.js
@@ -9,7 +9,6 @@ import {
   Col,
   Card,
   CardBody,
-  CardFooter,
   Form,
   FormGroup,
   Input,
@@ -18,7 +17,6 @@ import {
   Table,
   Spinner,
 } from 'reactstrap';
-import Loader from '../../common/Loader';
 import createMarkup from '../../../helpers/createMarkup';
 import Datetime from 'react-datetime';
 import moment from 'moment';
diff --git a/web/src/components/MyEMS/common/AssociatedEquipmentTable.js b/web/src/components/MyEMS/common/AssociatedEquipmentTable.js
index a00011b2..c2d52784 100644
--- a/web/src/components/MyEMS/common/AssociatedEquipmentTable.js
+++ b/web/src/components/MyEMS/common/AssociatedEquipmentTable.js
@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import BootstrapTable from 'react-bootstrap-table-next';
 import FalconCardHeader from '../../common/FalconCardHeader';
-import ButtonIcon from '../../common/ButtonIcon';
 import { Card, CardBody, CardHeader, Row, Col } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 
diff --git a/web/src/components/MyEMS/common/ChildSpacesTable.js b/web/src/components/MyEMS/common/ChildSpacesTable.js
index e4bbb73b..5d7cf7ff 100644
--- a/web/src/components/MyEMS/common/ChildSpacesTable.js
+++ b/web/src/components/MyEMS/common/ChildSpacesTable.js
@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import BootstrapTable from 'react-bootstrap-table-next';
 import FalconCardHeader from '../../common/FalconCardHeader';
-import ButtonIcon from '../../common/ButtonIcon';
 import { Card, CardBody, CardHeader, Row, Col } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 
diff --git a/web/src/components/MyEMS/common/DetailedDataTable.js b/web/src/components/MyEMS/common/DetailedDataTable.js
index 85598546..ed528e05 100644
--- a/web/src/components/MyEMS/common/DetailedDataTable.js
+++ b/web/src/components/MyEMS/common/DetailedDataTable.js
@@ -7,7 +7,6 @@ import {
   Row, 
   Col } from 'reactstrap';
 import FalconCardHeader from '../../common/FalconCardHeader';
-import ButtonIcon from '../../common/ButtonIcon';
 import { withTranslation } from 'react-i18next';
 import paginationFactory, { PaginationProvider } from 'react-bootstrap-table2-paginator';
 import { getPaginationArray } from '../../../helpers/utils';