diff --git a/app/Root.jsx b/app/Root.jsx
index a9129436c9989311c4458aa6cb64dbf087af9709..3d73ac54e55757ca7f6e3300275a97969df45976 100644
--- a/app/Root.jsx
+++ b/app/Root.jsx
@@ -101,9 +101,6 @@ const makeApolloClient = (makeConfig, connectToWebSocket) => {
   const config = {
     link,
     cache: new InMemoryCache({
-      possibleTypes: {
-        Identity: ['LocalIdentity', 'ExternalIdentity'],
-      },
       typePolicies: {
         Manuscript: {
           fields: {
diff --git a/app/components/component-chat/src/Messages/Messages.jsx b/app/components/component-chat/src/Messages/Messages.jsx
index 8ca81aaf86f06c4cd7ae419a9e21f30d83cad1f7..380869ac631af35624dd403fc695e94ba72542ad 100644
--- a/app/components/component-chat/src/Messages/Messages.jsx
+++ b/app/components/component-chat/src/Messages/Messages.jsx
@@ -35,12 +35,8 @@ const GET_MESSAGES = gql`
           profilePicture
           online
           defaultIdentity {
-            ... on ExternalIdentity {
-              identifier
-            }
-            ... on LocalIdentity {
-              email
-            }
+            identifier
+            email
             type
             aff
             id
@@ -69,15 +65,11 @@ const MESSAGES_SUBSCRIPTION = gql`
         profilePicture
         online
         defaultIdentity {
-          id
-          ... on ExternalIdentity {
-            identifier
-          }
-          ... on LocalIdentity {
-            email
-          }
+          identifier
+          email
           type
           aff
+          id
           name
         }
       }
diff --git a/app/components/component-profile/src/Profile.jsx b/app/components/component-profile/src/Profile.jsx
index a137940b612b238a9e0cd3986bba83dadf09d2be..5ed55f5b30f91cbbddee06c78869954c953894af 100644
--- a/app/components/component-profile/src/Profile.jsx
+++ b/app/components/component-profile/src/Profile.jsx
@@ -19,15 +19,12 @@ const GET_CURRENT_USER = gql`
       profilePicture
       username
       defaultIdentity {
+        identifier
+        email
+        type
         aff
+        id
         name
-        type
-        ... on ExternalIdentity {
-          identifier
-        }
-        ... on LocalIdentity {
-          email
-        }
       }
     }
   }
diff --git a/app/fragmentTypes.json b/app/fragmentTypes.json
deleted file mode 100644
index 571ad559ceacb8cc27ca7155a64e35a74a922336..0000000000000000000000000000000000000000
--- a/app/fragmentTypes.json
+++ /dev/null
@@ -1 +0,0 @@
-{"__schema":{"types":[{"kind":"INTERFACE","name":"Identity","possibleTypes":[{"name":"LocalIdentity"},{"name":"ExternalIdentity"}]},{"kind":"INTERFACE","name":"Object","possibleTypes":[{"name":"Manuscript"},{"name":"ManuscriptVersion"},{"name":"File"},{"name":"Review"},{"name":"Note"}]}]}}
\ No newline at end of file
diff --git a/app/queries/index.js b/app/queries/index.js
index 17d6b3ba206f39b9addd2edd475969fc85f5c51a..6f86f24089190cc2f054069b6b881f52872b5d02 100644
--- a/app/queries/index.js
+++ b/app/queries/index.js
@@ -8,15 +8,12 @@ export const GET_CURRENT_USER = gql`
       username
       admin
       defaultIdentity {
+        identifier
+        email
+        type
         aff
+        id
         name
-        type
-        ... on ExternalIdentity {
-          identifier
-        }
-        ... on LocalIdentity {
-          email
-        }
       }
       online
       _currentRoles {