diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 8352ca9c431c779d88944de4e68c30054aae0d51..60fea30e76beb439f8808970e5f2bafdd6efa318 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -21,4 +21,3 @@ export { default as CustomTagBlockComponent } from './src/components/customtag/C
 
 export { default as useDebounce } from './src/helpers/useDebounce';
 export { default as useOnClickOutside } from './src/helpers/useOnClickOutside';
-export { default as DateParser } from './src/helpers/DateParser';
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 021e096d07039792afa7476b8d82dae23924a369..0d0eab3ffe11d0e05cb73c764b163b6afa58275a 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -36,3 +36,4 @@ export { default as trackedTransaction } from './src/utilities/track-changes/tra
 export { default as LeftMenuTitle } from './src/components/LeftMenuTitle';
 export { default as LeftSideButton } from './src/components/LeftSideButton';
 export { default as ReactDropDownStyles } from './src/components/helpers/ReactDropDownStyles';
+export { default as DateParser } from './src/components/helpers/DateParser';
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index f20d44a4a73e3a6aed5feeada060ba00110b10ce..3e71a976e9958c63918c29a0e488cdf2cf1871b8 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -32,7 +32,9 @@
     "prosemirror-view": "1.23.7",
     "reflect-metadata": "^0.1.13",
     "styled-components": "^5.3.0",
-    "uuid": "^7.0.3"
+    "uuid": "^7.0.3",
+    "moment": "^2.29.0",
+    "prop-types": "^15.7.2"
   },
   "devDependencies": {
     "mocha": "^3.4.2",
diff --git a/wax-prosemirror-components/src/helpers/DateParser.js b/wax-prosemirror-core/src/components/helpers/DateParser.js
similarity index 100%
rename from wax-prosemirror-components/src/helpers/DateParser.js
rename to wax-prosemirror-core/src/components/helpers/DateParser.js
diff --git a/wax-prosemirror-services/src/CommentsService/components/ui/comments/CommentItem.js b/wax-prosemirror-services/src/CommentsService/components/ui/comments/CommentItem.js
index f27b2c527e7ed8f7c724211496056bca2ad6b278..e418c91b68aa9ba9663be6238fd0dd9543b37392 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ui/comments/CommentItem.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ui/comments/CommentItem.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import styled from 'styled-components';
 
 import { grid, th } from '@pubsweet/ui-toolkit';
-import { DateParser } from 'wax-prosemirror-components';
+import { DateParser } from 'wax-prosemirror-core';
 
 const Wrapper = styled.div``;
 
diff --git a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js
index 6a968d7ff2978cdd06b5a81ac411a3af91884aeb..25eb6d840c15ae1352d7a3cb5da7aa2c0bd7f9eb 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js
@@ -1,7 +1,8 @@
 /* eslint react/prop-types: 0 */
 import React from 'react';
 import styled, { css } from 'styled-components';
-import { DateParser, Icon } from 'wax-prosemirror-components';
+import { Icon } from 'wax-prosemirror-components';
+import { DateParser } from 'wax-prosemirror-core';
 
 const activeBorder = css`
   border-color: #bfc4cd;