diff --git a/portal-ui/src/icons/ConsoleLogo.tsx b/portal-ui/src/icons/ConsoleLogo.tsx
index c8ea845fb..4e32db4a0 100644
--- a/portal-ui/src/icons/ConsoleLogo.tsx
+++ b/portal-ui/src/icons/ConsoleLogo.tsx
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React from "react";
-import SvgIcon from "@material-ui/core/SvgIcon";
 
 interface IConsoleLogo {
   width?: number;
diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx
index 26cf9cbb5..ab3aa7fa7 100644
--- a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx
+++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx
@@ -46,10 +46,8 @@ import List from "@material-ui/core/List";
 import ListItem from "@material-ui/core/ListItem";
 import ListItemText from "@material-ui/core/ListItemText";
 import ScreenTitle from "../../Common/ScreenTitle/ScreenTitle";
-import { niceBytes } from "../../../../common/utils";
 import { IconButton, Tooltip } from "@material-ui/core";
-import { BucketsIcon, ClustersIcon, DeleteIcon } from "../../../../icons";
-import PencilIcon from "../../Common/TableWrapper/TableActionIcons/PencilIcon";
+import { BucketsIcon, DeleteIcon } from "../../../../icons";
 import RefreshIcon from "@material-ui/icons/Refresh";
 import DeleteBucket from "../ListBuckets/DeleteBucket";
 
@@ -199,7 +197,7 @@ const BucketDetails = ({
       setBucketDetailsLoad(true);
       setIniLoad(true);
     }
-  }, [iniLoad, setIniLoad]);
+  }, [iniLoad, setBucketDetailsLoad, setIniLoad]);
 
   useEffect(() => {
     if (loadingBucket) {
@@ -214,7 +212,13 @@ const BucketDetails = ({
           setErrorSnackMessage(err);
         });
     }
-  }, [loadingBucket, setBucketDetailsLoad]);
+  }, [
+    bucketName,
+    loadingBucket,
+    setBucketDetailsLoad,
+    setBucketInfo,
+    setErrorSnackMessage,
+  ]);
 
   useEffect(() => {
     let matchURL = match.params ? match.params["0"] : "summary";
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
index f6b22dc6b..b936ec59b 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { FormEvent, Fragment, useEffect, useRef, useState } from "react";
+import React, { Fragment, useEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { withRouter } from "react-router-dom";
@@ -46,14 +46,11 @@ import PageHeader from "../../../../Common/PageHeader/PageHeader";
 import {
   Badge,
   Button,
-  CircularProgress,
   IconButton,
-  Input,
   Tooltip,
   Typography,
 } from "@material-ui/core";
 import * as reactMoment from "react-moment";
-import { CreateIcon } from "../../../../../../icons";
 import BrowserBreadcrumbs from "../../../../ObjectBrowser/BrowserBreadcrumbs";
 import {
   addRoute,
@@ -82,9 +79,6 @@ import DeleteIcon from "@material-ui/icons/Delete";
 import DeleteMultipleObjects from "./DeleteMultipleObjects";
 import { baseUrl } from "../../../../../../history";
 import ScreenTitle from "../../../../Common/ScreenTitle/ScreenTitle";
-import AttachFileIcon from "@material-ui/icons/AttachFile";
-import ShareIcon from "../../../../../../icons/ShareIcon";
-import DownloadIcon from "../../../../../../icons/DownloadIcon";
 import { CreateNewFolder, FolderOpen } from "@material-ui/icons";
 
 const commonIcon = {
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
index 3312f511a..38c43d427 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
@@ -80,7 +80,6 @@ import AddTagModal from "./AddTagModal";
 import DeleteTagModal from "./DeleteTagModal";
 import SetLegalHoldModal from "./SetLegalHoldModal";
 import ScreenTitle from "../../../../Common/ScreenTitle/ScreenTitle";
-import AttachFileIcon from "@material-ui/icons/AttachFile";
 import DescriptionIcon from "@material-ui/icons/Description";
 
 const styles = (theme: Theme) =>
diff --git a/portal-ui/src/screens/Console/Buckets/actions.ts b/portal-ui/src/screens/Console/Buckets/actions.ts
index 13a8d6e75..7c874762f 100644
--- a/portal-ui/src/screens/Console/Buckets/actions.ts
+++ b/portal-ui/src/screens/Console/Buckets/actions.ts
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import { TENANT_DETAILS_SET_LOADING } from "../Tenants/types";
 import { BucketInfo } from "./types";
 
 export const ADD_BUCKET_OPEN = "ADD_BUCKET_OPEN";
diff --git a/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx b/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx
index 5948756c7..1a2b7c90f 100644
--- a/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx
+++ b/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx
@@ -1,7 +1,22 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2021 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import React from "react";
 import Grid from "@material-ui/core/Grid";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { ClustersIcon } from "../../../../icons";
 
 interface IScreenTitle {
   classes: any;
diff --git a/portal-ui/src/screens/Console/Console.tsx b/portal-ui/src/screens/Console/Console.tsx
index 88f0f75cd..de9248a27 100644
--- a/portal-ui/src/screens/Console/Console.tsx
+++ b/portal-ui/src/screens/Console/Console.tsx
@@ -57,7 +57,6 @@ import Heal from "./Heal/Heal";
 import Watch from "./Watch/Watch";
 import HealthInfo from "./HealthInfo/HealthInfo";
 import Storage from "./Storage/Storage";
-import PodDetails from "./Tenants/TenantDetails/pods/PodDetails";
 import Metrics from "./Dashboard/Metrics";
 import Hop from "./Tenants/TenantDetails/hop/Hop";
 import MainError from "./Common/MainError/MainError";
diff --git a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx
index 5052973cb..700fb3558 100644
--- a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx
+++ b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx
@@ -289,7 +289,6 @@ const PrDashboard = ({
           scrollButtons="auto"
           value={curTab}
           onChange={(e: React.ChangeEvent<{}>, newValue: number) => {
-            console.log(newValue);
             setCurTab(newValue);
           }}
         >
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
index 72af5ef5e..ed33d15e9 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
+++ b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
@@ -23,7 +23,7 @@ import Grid from "@material-ui/core/Grid";
 import TextField from "@material-ui/core/TextField";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
-import { Button, IconButton, Tooltip } from "@material-ui/core";
+import { IconButton, Tooltip } from "@material-ui/core";
 import { BucketsIcon, CreateIcon } from "../../../icons";
 import { niceBytes } from "../../../common/utils";
 import { Bucket, BucketList, HasPermissionResponse } from "../Buckets/types";
diff --git a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
index 5208046ea..3ec4e35f7 100644
--- a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
+++ b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
@@ -18,7 +18,6 @@ import React, { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { LinearProgress } from "@material-ui/core";
-import Paper from "@material-ui/core/Paper";
 import Grid from "@material-ui/core/Grid";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
diff --git a/portal-ui/src/screens/Console/Storage/Storage.tsx b/portal-ui/src/screens/Console/Storage/Storage.tsx
index 6f4007fae..dd3571c31 100644
--- a/portal-ui/src/screens/Console/Storage/Storage.tsx
+++ b/portal-ui/src/screens/Console/Storage/Storage.tsx
@@ -16,7 +16,7 @@
 
 import React, { Fragment, useState, useEffect } from "react";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { Grid, ListItem, ListItemText, Tab, Tabs } from "@material-ui/core";
+import { Grid, ListItem, ListItemText } from "@material-ui/core";
 import { Route, Router, Switch, Redirect } from "react-router-dom";
 import {
   actionsTray,
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
index 120f03e28..b0d59e275 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
@@ -237,6 +237,8 @@ const IdentityProvider = ({
     ADGroupNameAttribute,
     ADUserDNs,
     isPageValid,
+    openIDConfigurationURL,
+    openIDClaimName,
   ]);
   let inputs = null;
   if (idpSelection === "Built-in") {
diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDetails.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDetails.tsx
index d4222362a..db7266ded 100644
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDetails.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDetails.tsx
@@ -18,13 +18,10 @@ import React, { Fragment, useEffect, useState } from "react";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { containerForHeader } from "../../../Common/FormComponents/common/styleLibrary";
 import Grid from "@material-ui/core/Grid";
-import { IconButton } from "@material-ui/core";
 import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
-import PageHeader from "../../../Common/PageHeader/PageHeader";
 import { Link } from "react-router-dom";
 import { setErrorSnackMessage } from "../../../../../actions";
-import RefreshIcon from "@material-ui/icons/Refresh";
 import PodLogs from "./PodLogs";
 import PodEvents from "./PodEvents";
 
@@ -64,7 +61,7 @@ const PodDetails = ({ classes, match }: IPodDetailsProps) => {
   }, [loading]);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Grid item xs={12}>
         <div className={classes.topSpacer} />
         <h1 className={classes.sectionTitle}>
@@ -111,7 +108,7 @@ const PodDetails = ({ classes, match }: IPodDetailsProps) => {
           />
         )}
       </Grid>
-    </React.Fragment>
+    </Fragment>
   );
 };
 
diff --git a/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx b/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx
index 31498f749..ad1fd40da 100644
--- a/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx
+++ b/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx
@@ -19,7 +19,6 @@ import { connect } from "react-redux";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { LinearProgress } from "@material-ui/core";
 import get from "lodash/get";
-import Paper from "@material-ui/core/Paper";
 import Grid from "@material-ui/core/Grid";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";