diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.component.js
index baf588711b..f9f0ad3977 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.component.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.component.js
@@ -1,7 +1,6 @@
 // @flow
 import React from 'react';
 import type { ComponentType } from 'react';
-import withStyles from '@material-ui/core/styles/withStyles';
 import { compose } from 'redux';
 import type { Props } from './EnrollmentPage.types';
 import { enrollmentPageStatuses } from './EnrollmentPage.constants';
@@ -10,34 +9,16 @@ import { withErrorMessageHandler } from '../../../HOC';
 import { MissingMessage } from './MissingMessage.component';
 import { EnrollmentPageDefault } from './EnrollmentPageDefault';
 
-
-const getStyles = ({ typography }) => ({
-    loadingMask: {
-        height: '100vh',
-    },
-    title: {
-        ...typography.title,
-    },
-});
-
-const EnrollmentPagePlain = ({
-    classes,
-    enrollmentPageStatus,
-}) => (
+const EnrollmentPagePlain = ({ enrollmentPageStatus }) => (
     <div data-test="enrollment-page-content">
         {enrollmentPageStatus === enrollmentPageStatuses.MISSING_SELECTIONS && <MissingMessage />}
 
         {enrollmentPageStatus === enrollmentPageStatuses.DEFAULT && <EnrollmentPageDefault />}
 
-        {enrollmentPageStatus === enrollmentPageStatuses.LOADING && (
-            <div className={classes.loadingMask}>
-                <LoadingMaskForPage />
-            </div>
-        )}
+        {enrollmentPageStatus === enrollmentPageStatuses.LOADING && <LoadingMaskForPage />}
     </div>
 );
 
 export const EnrollmentPageComponent: ComponentType<$Diff<Props, CssClasses>> = compose(
     withErrorMessageHandler(),
-    withStyles(getStyles),
 )(EnrollmentPagePlain);
diff --git a/src/core_modules/capture-core/components/TopBarActions/TopBarActions.container.js b/src/core_modules/capture-core/components/TopBarActions/TopBarActions.container.js
index ca70646052..0a5f9ba472 100644
--- a/src/core_modules/capture-core/components/TopBarActions/TopBarActions.container.js
+++ b/src/core_modules/capture-core/components/TopBarActions/TopBarActions.container.js
@@ -30,8 +30,8 @@ export const TopBarActions = ({
         openNewRegistrationPageWithoutProgramId ||
         openSearchPage ||
         openSearchPageWithoutProgramId;
-    const { navigate } = useNavigate();
 
+    const { navigate } = useNavigate();
 
     const newRegistrationPage = () => {
         const queryArgs = {};
diff --git a/src/core_modules/capture-core/utils/routing/useNavigate.js b/src/core_modules/capture-core/utils/routing/useNavigate.js
index 9bec8ce2c9..c46426a146 100644
--- a/src/core_modules/capture-core/utils/routing/useNavigate.js
+++ b/src/core_modules/capture-core/utils/routing/useNavigate.js
@@ -13,4 +13,3 @@ export const useNavigate = () => {
 
     return { navigate };
 };
-