diff --git a/src/editors/data/constants/requests.js b/src/editors/data/constants/requests.js
index d2ac9ccc6..c85baabb9 100644
--- a/src/editors/data/constants/requests.js
+++ b/src/editors/data/constants/requests.js
@@ -1,11 +1,5 @@
 import { StrictDict } from '../../utils';
 
-export const ReqeustKeys = StrictDict({
-  fetchBlock: 'fetchBlock',
-  fetchUnit: 'fetchUnit',
-  saveBlock: 'saveBlock',
-});
-
 export const RequestStates = StrictDict({
   inactive: 'inactive',
   pending: 'pending',
diff --git a/src/editors/data/redux/app/.selectors.js.swp b/src/editors/data/redux/app/.selectors.js.swp
deleted file mode 100644
index e8be6db75..000000000
Binary files a/src/editors/data/redux/app/.selectors.js.swp and /dev/null differ
diff --git a/src/editors/data/redux/app/selectors.js b/src/editors/data/redux/app/selectors.js
index f83a82ee6..256fcac3d 100644
--- a/src/editors/data/redux/app/selectors.js
+++ b/src/editors/data/redux/app/selectors.js
@@ -1,7 +1,7 @@
 import { createSelector } from 'reselect';
 
 import { blockTypes } from '../../constants/app';
-import * as urls from '../../services/lms/urls';
+import * as urls from '../../services/cms/urls';
 import * as module from './selectors';
 
 export const appSelector = (state) => state.app;
diff --git a/src/editors/data/redux/requests/selectors.js b/src/editors/data/redux/requests/selectors.js
index 2a4ba632e..480944f2a 100644
--- a/src/editors/data/redux/requests/selectors.js
+++ b/src/editors/data/redux/requests/selectors.js
@@ -19,13 +19,8 @@ export const errorCode = (request) => request.error?.response?.data;
 
 export const data = (request) => request.data;
 
-export const allowNavigation = ({ requests }) => (
-  !Object.keys(requests).some(requestKey => module.isPending(requests[requestKey]))
-);
-
 export default StrictDict({
   requestStatus,
-  allowNavigation,
   isInactive: statusSelector(isInactive),
   isPending: statusSelector(isPending),
   isCompleted: statusSelector(isCompleted),
diff --git a/src/editors/data/redux/thunkActions/requests.js b/src/editors/data/redux/thunkActions/requests.js
index 1389d7447..d7e0bac4b 100644
--- a/src/editors/data/redux/thunkActions/requests.js
+++ b/src/editors/data/redux/thunkActions/requests.js
@@ -2,7 +2,7 @@ import { StrictDict } from '../../../utils';
 
 import { RequestKeys } from '../../constants/requests';
 import { actions, selectors } from '..';
-import * as api from '../../services/lms/api';
+import * as api from '../../services/cms/api';
 
 import * as module from './requests';
 
diff --git a/src/editors/data/services/lms/api.js b/src/editors/data/services/cms/api.js
similarity index 100%
rename from src/editors/data/services/lms/api.js
rename to src/editors/data/services/cms/api.js
diff --git a/src/editors/data/services/lms/api.test.js b/src/editors/data/services/cms/api.test.js
similarity index 100%
rename from src/editors/data/services/lms/api.test.js
rename to src/editors/data/services/cms/api.test.js
diff --git a/src/editors/data/services/lms/urls.js b/src/editors/data/services/cms/urls.js
similarity index 100%
rename from src/editors/data/services/lms/urls.js
rename to src/editors/data/services/cms/urls.js
diff --git a/src/editors/data/services/lms/utils.js b/src/editors/data/services/cms/utils.js
similarity index 100%
rename from src/editors/data/services/lms/utils.js
rename to src/editors/data/services/cms/utils.js
diff --git a/src/editors/data/services/lms/utils.test.js b/src/editors/data/services/cms/utils.test.js
similarity index 97%
rename from src/editors/data/services/lms/utils.test.js
rename to src/editors/data/services/cms/utils.test.js
index a033bbae7..d158dac9f 100644
--- a/src/editors/data/services/lms/utils.test.js
+++ b/src/editors/data/services/cms/utils.test.js
@@ -9,7 +9,7 @@ jest.mock('@edx/frontend-platform/auth', () => ({
   getAuthenticatedHttpClient: jest.fn(),
 }));
 
-describe('lms service utils', () => {
+describe('cms service utils', () => {
   describe('get', () => {
     it('forwards arguments to authenticatedHttpClient().get', () => {
       const get = jest.fn((...args) => ({ get: args }));