diff --git a/plugins/circleci/src/components/PluginHeader/PluginHeader.tsx b/plugins/circleci/src/components/PluginHeader/PluginHeader.tsx
index 952e2578cd..7bd35d0805 100644
--- a/plugins/circleci/src/components/PluginHeader/PluginHeader.tsx
+++ b/plugins/circleci/src/components/PluginHeader/PluginHeader.tsx
@@ -17,7 +17,8 @@ import React, { FC } from 'react';
 import { Link as RouterLink, useLocation } from 'react-router-dom';
 import { ContentHeader, SupportButton } from '@backstage/core';
 import { Button, IconButton, Box, Typography } from '@material-ui/core';
-import { Settings as SettingsIcon, ArrowBack } from '@material-ui/icons';
+import ArrowBack from '@material-ui/icons/ArrowBack';
+import SettingsIcon from '@material-ui/icons/Settings';
 
 export type Props = { title?: string };
 export const PluginHeader: FC<Props> = ({ title = 'Circle CI' }) => {
diff --git a/plugins/circleci/src/pages/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/pages/BuildsPage/lib/CITable/CITable.tsx
index b04e52b3a9..f8e0026ff5 100644
--- a/plugins/circleci/src/pages/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/circleci/src/pages/BuildsPage/lib/CITable/CITable.tsx
@@ -15,7 +15,8 @@
  */
 import React, { FC } from 'react';
 import { Link, Typography, Box, IconButton } from '@material-ui/core';
-import { Replay as RetryIcon, GitHub as GithubIcon } from '@material-ui/icons';
+import RetryIcon from '@material-ui/icons/Replay';
+import GitHubIcon from '@material-ui/icons/GitHub';
 import { Link as RouterLink } from 'react-router-dom';
 import {
   StatusError,
@@ -123,7 +124,7 @@ export const CITable: FC<{
       data={builds}
       title={
         <Box display="flex" alignItems="center">
-          <GithubIcon />
+          <GitHubIcon />
           <Box mr={1} />
           <Typography variant="h6">{projectName}</Typography>
         </Box>
diff --git a/plugins/circleci/src/state/useBuildWithSteps.ts b/plugins/circleci/src/state/useBuildWithSteps.ts
index 2787143658..96d3a3f159 100644
--- a/plugins/circleci/src/state/useBuildWithSteps.ts
+++ b/plugins/circleci/src/state/useBuildWithSteps.ts
@@ -29,7 +29,6 @@ export function useBuildWithSteps(buildId: number) {
   const api = useApi(circleCIApiRef);
   const errorApi = useApi(errorApiRef);
 
-  /* eslint-disable-line no-use-before-define */
   const { isPolling, startPolling, stopPolling } = useAsyncPolling(
     () => getBuildWithSteps(),
     INTERVAL_AMOUNT,
diff --git a/plugins/circleci/src/state/useBuilds.tsx b/plugins/circleci/src/state/useBuilds.tsx
index 9104b134cc..d46ac642a5 100644
--- a/plugins/circleci/src/state/useBuilds.tsx
+++ b/plugins/circleci/src/state/useBuilds.tsx
@@ -27,7 +27,6 @@ export function useBuilds() {
 
   const api = useApi(circleCIApiRef);
   const errorApi = useApi(errorApiRef);
-  // eslint-disable-line no-use-before-define
   const { isPolling, startPolling, stopPolling } = useAsyncPolling(
     () => getBuilds(),
     INTERVAL_AMOUNT,