diff --git a/client/coral-admin/config.json b/client/coral-admin/config.json
deleted file mode 100644
index 156740de5..000000000
--- a/client/coral-admin/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "basePath": "admin"
-}
diff --git a/client/coral-admin/src/services/PymConnection.js b/client/coral-admin/src/services/PymConnection.js
deleted file mode 100644
index ca592b824..000000000
--- a/client/coral-admin/src/services/PymConnection.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Pym from '../../node_modules/pym.js';
-
-const pym = new Pym.Child({polling: 100});
-export default pym;
-
-export const link = (url) => (e) => {
-  e.preventDefault();
-  pym.sendMessage('navigate', url);
-};
diff --git a/client/coral-admin/src/services/client.js b/client/coral-admin/src/services/client.js
index ff8216373..df97066bc 100644
--- a/client/coral-admin/src/services/client.js
+++ b/client/coral-admin/src/services/client.js
@@ -4,13 +4,17 @@ import fragmentMatcher from './fragmentMatcher';
 
 export const client = new ApolloClient({
   fragmentMatcher,
+  connectToDevTools: true,
   addTypename: true,
   queryTransformer: addTypename,
   dataIdFromObject: (result) => {
     if (result.id && result.__typename) { // eslint-disable-line no-underscore-dangle
-      return result.__typename + result.id; // eslint-disable-line no-underscore-dangle
+      return `${result.__typename}_${result.id}`; // eslint-disable-line no-underscore-dangle
     }
     return null;
   },
   networkInterface
 });
+
+export default client;
+
diff --git a/client/coral-admin/src/services/config.js b/client/coral-admin/src/services/config.js
deleted file mode 100644
index 05cf0ecb8..000000000
--- a/client/coral-admin/src/services/config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-/**
- * Just load the root config file and throw an
- * error message if not present
- */
-
-try {
-  module.exports = require('../../config.json');
-} catch (error) {
-  const message = `The config.json file under the root directory is missing
-or invalid Please add one to use this app. You can use config.sample.json as a guide.`;
-  window.alert(message);
-  throw new Error(message);
-}
diff --git a/client/coral-admin/src/services/subscriptions.js b/client/coral-admin/src/services/subscriptions.js
deleted file mode 100644
index f514ea18b..000000000
--- a/client/coral-admin/src/services/subscriptions.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {print} from 'graphql-tag/printer';
-
-// quick way to add the subscribe and unsubscribe functions to the network interface
-const addGraphQLSubscriptions = (networkInterface, wsClient) => Object.assign(networkInterface, {
-  subscribe: (request, handler) => wsClient.subscribe({
-    query: print(request.query),
-    variables: request.variables,
-  }, handler),
-  unsubscribe: (id) => {
-    wsClient.unsubscribe(id);
-  },
-});
-
-export default addGraphQLSubscriptions;
diff --git a/client/coral-framework/services/client.js b/client/coral-framework/services/client.js
index 47ea9c352..c77bc9848 100644
--- a/client/coral-framework/services/client.js
+++ b/client/coral-framework/services/client.js
@@ -13,6 +13,7 @@ import {networkInterface} from './transport';
 // );
 export const client = new ApolloClient({
   connectToDevTools: true,
+  addTypename: true,
   queryTransformer: addTypename,
   dataIdFromObject: (result) => {
     if (result.id && result.__typename) { // eslint-disable-line no-underscore-dangle
@@ -24,3 +25,4 @@ export const client = new ApolloClient({
 });
 
 export default client;
+