diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json
index 6845878..1b81bb0 100644
--- a/.npm/package/npm-shrinkwrap.json
+++ b/.npm/package/npm-shrinkwrap.json
@@ -1,79 +1,80 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "balanced-match": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "from": "balanced-match@>=0.4.1 <0.5.0"
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
     },
     "brace-expansion": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
-      "from": "brace-expansion@>=1.0.0 <2.0.0"
+      "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk="
     },
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "from": "commander@>=2.9.0 <3.0.0"
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "from": "concat-map@0.0.1"
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "dot-object": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-1.5.4.tgz",
-      "from": "dot-object@1.5.4"
+      "integrity": "sha1-ryuN8mJrZQIM1nKdRsMxvDDTtIc="
     },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "from": "fs.realpath@>=1.0.0 <2.0.0"
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-      "from": "glob@>=7.0.5 <8.0.0"
+      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg="
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "from": "graceful-readlink@>=1.0.0"
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "from": "inflight@>=1.0.4 <2.0.0"
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.0 <3.0.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-      "from": "minimatch@>=3.0.2 <4.0.0"
+      "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q="
     },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "from": "once@>=1.3.0 <2.0.0"
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0"
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "sift": {
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/sift/-/sift-3.2.6.tgz",
-      "from": "sift@3.2.6"
+      "integrity": "sha1-rht0k2FN9ftfZVdzLU9PAm7zQMg="
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "from": "wrappy@>=1.0.0 <2.0.0"
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     }
   }
 }
diff --git a/lib/links/linker.js b/lib/links/linker.js
index 933cd7f..f3ece6d 100644
--- a/lib/links/linker.js
+++ b/lib/links/linker.js
@@ -3,9 +3,7 @@ import LinkManyMeta from './linkTypes/linkManyMeta.js';
 import LinkOne from './linkTypes/linkOne.js';
 import LinkOneMeta from './linkTypes/linkOneMeta.js';
 import LinkResolve from './linkTypes/linkResolve.js';
-import {linkStorage as linkStorageSymbol} from './symbols.js';
 import ConfigSchema from './config.schema.js';
-import attachFieldSchema from './lib/attachFieldSchema.js';
 import smartArguments from './linkTypes/lib/smartArguments';
 
 export default class Linker {
@@ -262,10 +260,6 @@ export default class Linker {
         if (this.isVirtual() || this.isResolver()) {
             return;
         }
-
-        if (this.mainCollection.simpleSchema && this.mainCollection.simpleSchema()) {
-            attachFieldSchema(this.mainCollection, this.linkConfig, this.isMany());
-        }
     }
 
     /**
diff --git a/lib/namedQuery/_extension.js b/lib/namedQuery/_extension.js
index a1b7d24..4bb6a38 100644
--- a/lib/namedQuery/_extension.js
+++ b/lib/namedQuery/_extension.js
@@ -1,5 +1,3 @@
-import createQuery from '../query/createQuery.js';
-
 _.extend(Mongo.Collection.prototype, {
     createNamedQuery(...args) {
       console.warn('createNamedQuery is deprecated. Functionality has been moved over to createQuery');
diff --git a/lib/namedQuery/testing/bootstrap/queries/postListExposure.js b/lib/namedQuery/testing/bootstrap/queries/postListExposure.js
index 199e0be..692a831 100644
--- a/lib/namedQuery/testing/bootstrap/queries/postListExposure.js
+++ b/lib/namedQuery/testing/bootstrap/queries/postListExposure.js
@@ -1,6 +1,6 @@
-import { createNamedQuery } from 'meteor/cultofcoders:grapher';
+import { createQuery } from 'meteor/cultofcoders:grapher';
 
-export default createNamedQuery('postListExposure', {
+export default createQuery('postListExposure', {
     posts: {
         title: 1,
         author: {
diff --git a/lib/namedQuery/testing/bootstrap/server.js b/lib/namedQuery/testing/bootstrap/server.js
index 5d8b6a2..73476ba 100644
--- a/lib/namedQuery/testing/bootstrap/server.js
+++ b/lib/namedQuery/testing/bootstrap/server.js
@@ -1,7 +1,7 @@
-import { createNamedQuery } from 'meteor/cultofcoders:grapher';
+import { createQuery } from 'meteor/cultofcoders:grapher';
 import postListExposure from './queries/postListExposure.js';
 
-const postList = createNamedQuery('postList', {
+const postList = createQuery('postList', {
     posts: {
         $filter({filters, params}) {
             filters.title = params.title