From e533dd47e7900d1b9c72108859337d80e81502f9 Mon Sep 17 00:00:00 2001
From: xavcz <xavier.cazalot@gmail.com>
Date: Thu, 2 Feb 2017 16:18:33 +0100
Subject: [PATCH] fix some lint issues, remove some dead code, remove double
 imports from the same package & import from core instead of lib except for
 packages depending explicitly on lib (users, emails, ..)

---
 .../lib/components/CustomPostsItem.jsx        |   2 +-
 packages/customization-demo/lib/fragments.js  |   2 +-
 .../lib/components/MoviesItem.jsx             |   3 +-
 packages/framework-demo/lib/schema.js         |   1 -
 packages/nova-apollo/lib/export.js            |   2 +-
 packages/nova-apollo/lib/schema.js            |   2 +-
 packages/nova-apollo/lib/server.js            |   2 +-
 .../lib/categories/CategoriesEditForm.jsx     |   3 +-
 .../lib/categories/CategoriesList.jsx         |   4 +-
 .../lib/categories/CategoriesNewForm.jsx      |   3 +-
 .../lib/categories/CategoriesNode.jsx         |   2 +-
 .../lib/comments/CommentsEditForm.jsx         |   5 +-
 .../lib/comments/CommentsItem.jsx             |   3 +-
 .../lib/comments/CommentsList.jsx             |   2 +-
 .../lib/comments/CommentsLoadMore.jsx         |   2 +-
 .../lib/comments/CommentsNew.jsx              |  48 -------
 .../lib/comments/CommentsNewForm.jsx          |   3 +-
 .../lib/comments/CommentsNode.jsx             |   2 +-
 .../lib/common/Error404.jsx                   |   2 +-
 .../nova-base-components/lib/common/Flash.jsx |   2 +-
 .../lib/common/FlashMessages.jsx              |   3 +-
 .../lib/common/Footer.jsx                     |   2 +-
 .../lib/common/Layout.jsx                     |   2 +-
 .../nova-base-components/lib/common/Logo.jsx  |   2 +-
 .../lib/common/Newsletter.jsx                 |  15 +--
 .../lib/common/NewsletterButton.jsx           |   3 +-
 .../lib/common/SearchForm.jsx                 |   2 +-
 .../nova-base-components/lib/common/Vote.jsx  |   3 +-
 .../nova-base-components/lib/components.js    |   4 -
 .../lib/permissions/CanCreatePost.jsx         |  35 -----
 .../lib/permissions/CanDo.jsx                 |  59 ---------
 .../lib/permissions/CanEditPost.jsx           |  23 ----
 .../lib/permissions/CanEditUser.jsx           |  23 ----
 .../lib/permissions/CanView.jsx               |  22 ----
 .../lib/permissions/CanViewPost.jsx           |  23 ----
 .../lib/posts/PostsCategories.jsx             |   2 +-
 .../lib/posts/PostsCommenters.jsx             |   2 +-
 .../lib/posts/PostsDay.jsx                    |   4 +-
 .../lib/posts/PostsEditForm.jsx               |   3 +-
 .../lib/posts/PostsHome.jsx                   |   2 +-
 .../lib/posts/PostsItem.jsx                   |   4 +-
 .../lib/posts/PostsList.jsx                   |   4 +-
 .../lib/posts/PostsListHeader.jsx             |   3 +-
 .../lib/posts/PostsLoadMore.jsx               |   2 +-
 .../lib/posts/PostsLoading.jsx                |   2 +-
 .../lib/posts/PostsNewButton.jsx              |   7 +-
 .../lib/posts/PostsNewForm.jsx                |   5 +-
 .../lib/posts/PostsNoMore.jsx                 |   2 +-
 .../lib/posts/PostsNoResults.jsx              |   2 +-
 .../lib/posts/PostsSingle.jsx                 |   5 +-
 .../lib/posts/PostsStats.jsx                  |   2 +-
 .../lib/posts/PostsThumbnail.jsx              |   2 +-
 .../lib/posts/PostsViews.jsx                  |   3 +-
 .../lib/users/UsersAccount.jsx                |   3 +-
 .../lib/users/UsersAccountForm.jsx            |   2 +-
 .../lib/users/UsersAccountMenu.jsx            |   2 +-
 .../lib/users/UsersAvatar.jsx                 |   2 +-
 .../lib/users/UsersEditForm.jsx               |   3 +-
 .../lib/users/UsersMenu.jsx                   |   3 +-
 .../lib/users/UsersName.jsx                   |   2 +-
 .../lib/users/UsersProfile.jsx                |   3 +-
 .../lib/users/UsersResetPassword.jsx          |   3 +-
 .../lib/users/UsersSingle.jsx                 |   5 +-
 .../lib/stylesheets/bootstrap.css             |   2 +-
 .../lib/server/publications.js                |  24 ----
 .../lib/callbacks/callbacks_comments_edit.js  |   2 -
 .../lib/callbacks/callbacks_comments_new.js   |   3 +-
 .../callbacks/callbacks_comments_remove.js    |   5 +-
 .../lib/callbacks/callbacks_other.js          |   2 +-
 packages/nova-comments/lib/helpers.js         |   1 -
 .../lib/components/ContextPasser.jsx          |  34 -----
 packages/nova-core/lib/components/Layout.jsx  |  14 --
 .../nova-core/lib/components/ModalTrigger.jsx |   3 +-
 packages/nova-core/lib/containers/withApp.js  |  58 ---------
 packages/nova-core/lib/modules.js             |   2 -
 packages/nova-debug/lib/components/Emails.jsx |   2 +-
 packages/nova-debug/lib/globals.js            |   2 -
 packages/nova-email/lib/server/email.js       |   2 +-
 .../lib/components/EmbedlyURL.jsx             |   2 +-
 packages/nova-events/lib/helpers.js           |   8 +-
 packages/nova-i18n-en-us/lib/en_US.js         |   1 +
 .../lib/components/NewsletterSubscribe.jsx    |   3 +-
 .../lib/callbacks/callbacks_other.js          |   2 +-
 .../lib/callbacks/callbacks_posts_new.js      |   2 +-
 packages/nova-posts/lib/server.js             |   5 +-
 .../nova-posts/lib/server/publications.js     | 120 ------------------
 packages/nova-search/lib/parameters.js        |   4 +-
 packages/nova-subscribe/lib/callbacks.js      |   2 +-
 .../lib/components/PostsSubscribedList.jsx    |  30 -----
 packages/nova-users/lib/collection.js         |   2 +-
 packages/nova-voting/lib/resolvers.js         |   2 +-
 91 files changed, 92 insertions(+), 647 deletions(-)
 delete mode 100644 packages/nova-base-components/lib/comments/CommentsNew.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanCreatePost.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanDo.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanEditPost.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanEditUser.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanView.jsx
 delete mode 100644 packages/nova-base-components/lib/permissions/CanViewPost.jsx
 delete mode 100644 packages/nova-categories/lib/server/publications.js
 delete mode 100644 packages/nova-core/lib/components/ContextPasser.jsx
 delete mode 100644 packages/nova-core/lib/components/Layout.jsx
 delete mode 100644 packages/nova-core/lib/containers/withApp.js
 delete mode 100644 packages/nova-posts/lib/server/publications.js
 delete mode 100644 packages/nova-subscribe/lib/components/PostsSubscribedList.jsx

diff --git a/packages/customization-demo/lib/components/CustomPostsItem.jsx b/packages/customization-demo/lib/components/CustomPostsItem.jsx
index 1eebfc567..692972959 100644
--- a/packages/customization-demo/lib/components/CustomPostsItem.jsx
+++ b/packages/customization-demo/lib/components/CustomPostsItem.jsx
@@ -1,4 +1,4 @@
-import { Components, getRawComponent, replaceComponent } from 'meteor/nova:lib';
+import { Components, getRawComponent, replaceComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, FormattedRelative } from 'react-intl';
 import { Link } from 'react-router';
diff --git a/packages/customization-demo/lib/fragments.js b/packages/customization-demo/lib/fragments.js
index 58401e632..7a5940596 100644
--- a/packages/customization-demo/lib/fragments.js
+++ b/packages/customization-demo/lib/fragments.js
@@ -1,4 +1,4 @@
-import { extendFragment } from 'meteor/nova:lib';
+import { extendFragment } from 'meteor/nova:core';
 
 extendFragment('PostsList', `
   color # new custom property!
diff --git a/packages/framework-demo/lib/components/MoviesItem.jsx b/packages/framework-demo/lib/components/MoviesItem.jsx
index 7f26371cd..ab675ede8 100644
--- a/packages/framework-demo/lib/components/MoviesItem.jsx
+++ b/packages/framework-demo/lib/components/MoviesItem.jsx
@@ -7,8 +7,7 @@ Wrapped with the "withCurrentUser" container.
 
 import React, { PropTypes, Component } from 'react';
 import { Button } from 'react-bootstrap';
-import { ModalTrigger } from 'meteor/nova:core';
-import { Components, registerComponent, withCurrentUser } from 'meteor/nova:core';
+import { Components, registerComponent, withCurrentUser, ModalTrigger } from 'meteor/nova:core';
 import Movies from '../collection.js';
 
 class MoviesItem extends Component {
diff --git a/packages/framework-demo/lib/schema.js b/packages/framework-demo/lib/schema.js
index 28aab33a0..0188d14f1 100644
--- a/packages/framework-demo/lib/schema.js
+++ b/packages/framework-demo/lib/schema.js
@@ -5,7 +5,6 @@ A SimpleSchema-compatible JSON schema
 */
 
 import Users from 'meteor/nova:users';
-import { GraphQLSchema } from 'meteor/nova:core';
 
 // define schema
 const schema = {
diff --git a/packages/nova-apollo/lib/export.js b/packages/nova-apollo/lib/export.js
index a2747706c..d186cb728 100644
--- a/packages/nova-apollo/lib/export.js
+++ b/packages/nova-apollo/lib/export.js
@@ -1,4 +1,4 @@
-import { GraphQLSchema } from 'meteor/nova:lib';
+import { GraphQLSchema } from 'meteor/nova:core';
 
 import { makeExecutableSchema } from 'graphql-tools';
 
diff --git a/packages/nova-apollo/lib/schema.js b/packages/nova-apollo/lib/schema.js
index e8ddab474..47b911b14 100644
--- a/packages/nova-apollo/lib/schema.js
+++ b/packages/nova-apollo/lib/schema.js
@@ -1,4 +1,4 @@
-import { GraphQLSchema } from 'meteor/nova:lib';
+import { GraphQLSchema } from 'meteor/nova:core';
 
 const generateTypeDefs = () => [`
 
diff --git a/packages/nova-apollo/lib/server.js b/packages/nova-apollo/lib/server.js
index 4d7512aaa..83c318826 100644
--- a/packages/nova-apollo/lib/server.js
+++ b/packages/nova-apollo/lib/server.js
@@ -19,7 +19,7 @@ import { _ } from 'meteor/underscore';
 
 import Users from 'meteor/nova:users';
 
-import { GraphQLSchema } from 'meteor/nova:lib';
+import { GraphQLSchema } from 'meteor/nova:core';
 
 import OpticsAgent from 'optics-agent'
 
diff --git a/packages/nova-base-components/lib/categories/CategoriesEditForm.jsx b/packages/nova-base-components/lib/categories/CategoriesEditForm.jsx
index 5110ba3ab..dbbec1660 100644
--- a/packages/nova-base-components/lib/categories/CategoriesEditForm.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesEditForm.jsx
@@ -1,8 +1,7 @@
 import React, { PropTypes, Component } from 'react';
 import { intlShape } from 'react-intl';
-import { Components, registerComponent, getFragment } from 'meteor/nova:lib';
+import { Components, registerComponent, getFragment, withMessages } from 'meteor/nova:core';
 import Categories from "meteor/nova:categories";
-import { withMessages } from 'meteor/nova:core';
 
 const CategoriesEditForm = (props, context) => {
 
diff --git a/packages/nova-base-components/lib/categories/CategoriesList.jsx b/packages/nova-base-components/lib/categories/CategoriesList.jsx
index 42af94af7..56ac0430d 100644
--- a/packages/nova-base-components/lib/categories/CategoriesList.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesList.jsx
@@ -1,7 +1,7 @@
-import { ModalTrigger, Components, registerComponent, ShowIf, withList, Utils } from "meteor/nova:core";
+import { ModalTrigger, Components, registerComponent, withList, Utils } from "meteor/nova:core";
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { Button, DropdownButton, MenuItem, Modal } from 'react-bootstrap';
+import { Button, DropdownButton, MenuItem } from 'react-bootstrap';
 import { withRouter } from 'react-router'
 import { LinkContainer } from 'react-router-bootstrap';
 import Categories from 'meteor/nova:categories';
diff --git a/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx b/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
index 0d00e7213..689c29ad4 100644
--- a/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
@@ -1,8 +1,7 @@
 import React, { PropTypes, Component } from 'react';
 import { intlShape } from 'react-intl';
-import { Components, registerComponent, getFragment } from 'meteor/nova:lib';
+import { Components, registerComponent, getFragment, withMessages } from 'meteor/nova:core';
 import Categories from "meteor/nova:categories";
-import { withMessages } from 'meteor/nova:core';
 
 const CategoriesNewForm = (props, context) => {
 
diff --git a/packages/nova-base-components/lib/categories/CategoriesNode.jsx b/packages/nova-base-components/lib/categories/CategoriesNode.jsx
index 03da4c195..2eb06fb1e 100644
--- a/packages/nova-base-components/lib/categories/CategoriesNode.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesNode.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 
 class CategoriesNode extends Component {
diff --git a/packages/nova-base-components/lib/comments/CommentsEditForm.jsx b/packages/nova-base-components/lib/comments/CommentsEditForm.jsx
index 29342d23b..868dba6e9 100644
--- a/packages/nova-base-components/lib/comments/CommentsEditForm.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsEditForm.jsx
@@ -1,7 +1,6 @@
-import { Components, registerComponent, getFragment } from 'meteor/nova:core';
+import { Components, registerComponent, getFragment, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import Comments from "meteor/nova:comments";
-import { withMessages } from 'meteor/nova:core';
 
 const CommentsEditForm = (props, context) => {
   return (
@@ -26,4 +25,4 @@ CommentsEditForm.propTypes = {
   cancelCallback: React.PropTypes.func
 };
 
-registerComponent('CommentsEditForm', CommentsEditForm, withMessages);
\ No newline at end of file
+registerComponent('CommentsEditForm', CommentsEditForm, withMessages);
diff --git a/packages/nova-base-components/lib/comments/CommentsItem.jsx b/packages/nova-base-components/lib/comments/CommentsItem.jsx
index d9d935e16..3be206f08 100644
--- a/packages/nova-base-components/lib/comments/CommentsItem.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsItem.jsx
@@ -1,7 +1,6 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { intlShape, FormattedMessage, FormattedRelative } from 'react-intl';
-import { ShowIf, withCurrentUser, withMessages } from 'meteor/nova:core';
 import Comments from 'meteor/nova:comments';
 
 class CommentsItem extends Component{
diff --git a/packages/nova-base-components/lib/comments/CommentsList.jsx b/packages/nova-base-components/lib/comments/CommentsList.jsx
index 6a3da843c..0a3ba157e 100644
--- a/packages/nova-base-components/lib/comments/CommentsList.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsList.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
diff --git a/packages/nova-base-components/lib/comments/CommentsLoadMore.jsx b/packages/nova-base-components/lib/comments/CommentsLoadMore.jsx
index 2629a50c7..48c906069 100644
--- a/packages/nova-base-components/lib/comments/CommentsLoadMore.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsLoadMore.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 
 const CommentsLoadMore = ({loadMore, count, totalCount}) => {
diff --git a/packages/nova-base-components/lib/comments/CommentsNew.jsx b/packages/nova-base-components/lib/comments/CommentsNew.jsx
deleted file mode 100644
index f518160b3..000000000
--- a/packages/nova-base-components/lib/comments/CommentsNew.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { PropTypes, Component } from 'react';
-import Comments from "meteor/nova:comments";
-
-class CommentsNew extends Component {
-
-  render() {
-
-    let prefilledProps = {postId: this.props.postId};
-
-    if (this.props.parentComment) {
-      prefilledProps = Object.assign(prefilledProps, {
-        parentCommentId: this.props.parentComment._id,
-        // if parent comment has a topLevelCommentId use it; if it doesn't then it *is* the top level comment
-        topLevelCommentId: this.props.parentComment.topLevelCommentId || this.props.parentComment._id
-      });
-    }
-
-    return (
-      <div className="comments-new-form">
-        <Components.SmartForm
-          collection={Comments}
-          methodName="comments.new"
-          prefilledProps={prefilledProps}
-          successCallback={this.props.successCallback}
-          layout="elementOnly"
-          cancelCallback={this.props.type === "reply" ? this.props.cancelCallback : null}
-        />
-      </div>
-    )
-  }
-
-}
-
-CommentsNew.propTypes = {
-  postId: React.PropTypes.string.isRequired,
-  type: React.PropTypes.string, // "comment" or "reply"
-  parentComment: React.PropTypes.object, // if reply, the comment being replied to
-  parentCommentId: React.PropTypes.string, // if reply
-  topLevelCommentId: React.PropTypes.string, // if reply
-  successCallback: React.PropTypes.func, // a callback to execute when the submission has been successful
-  cancelCallback: React.PropTypes.func
-}
-
-CommentsNew.contextTypes = {
-  currentUser: React.PropTypes.object
-}
-
-module.exports = CommentsNew;
diff --git a/packages/nova-base-components/lib/comments/CommentsNewForm.jsx b/packages/nova-base-components/lib/comments/CommentsNewForm.jsx
index 890f1b246..08f0d2be2 100644
--- a/packages/nova-base-components/lib/comments/CommentsNewForm.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsNewForm.jsx
@@ -1,7 +1,6 @@
-import { Components, registerComponent, getFragment } from 'meteor/nova:core';
+import { Components, registerComponent, getFragment, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import Comments from "meteor/nova:comments";
-import { ShowIf, withMessages } from 'meteor/nova:core';
 import { FormattedMessage } from 'react-intl';
 
 const CommentsNewForm = (props, context) => {
diff --git a/packages/nova-base-components/lib/comments/CommentsNode.jsx b/packages/nova-base-components/lib/comments/CommentsNode.jsx
index 226bbc249..bb6a3bea5 100644
--- a/packages/nova-base-components/lib/comments/CommentsNode.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsNode.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 
 class CommentsNode extends Component {
diff --git a/packages/nova-base-components/lib/common/Error404.jsx b/packages/nova-base-components/lib/common/Error404.jsx
index 75cf981ae..bfcedb403 100644
--- a/packages/nova-base-components/lib/common/Error404.jsx
+++ b/packages/nova-base-components/lib/common/Error404.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
diff --git a/packages/nova-base-components/lib/common/Flash.jsx b/packages/nova-base-components/lib/common/Flash.jsx
index 02d264bc2..e8fd6139e 100644
--- a/packages/nova-base-components/lib/common/Flash.jsx
+++ b/packages/nova-base-components/lib/common/Flash.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { Alert } from 'react-bootstrap';
 
diff --git a/packages/nova-base-components/lib/common/FlashMessages.jsx b/packages/nova-base-components/lib/common/FlashMessages.jsx
index d69e34d8d..dededf8ca 100644
--- a/packages/nova-base-components/lib/common/FlashMessages.jsx
+++ b/packages/nova-base-components/lib/common/FlashMessages.jsx
@@ -1,5 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
-import { withMessages } from 'meteor/nova:core';
+import { Components, registerComponent, withMessages } from 'meteor/nova:core';
 import React from 'react';
 
 const FlashMessages = ({messages, clear, markAsSeen}) => {
diff --git a/packages/nova-base-components/lib/common/Footer.jsx b/packages/nova-base-components/lib/common/Footer.jsx
index 9a2f96159..28aee1efd 100644
--- a/packages/nova-base-components/lib/common/Footer.jsx
+++ b/packages/nova-base-components/lib/common/Footer.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
diff --git a/packages/nova-base-components/lib/common/Layout.jsx b/packages/nova-base-components/lib/common/Layout.jsx
index f3995ecd1..c10b0e19d 100644
--- a/packages/nova-base-components/lib/common/Layout.jsx
+++ b/packages/nova-base-components/lib/common/Layout.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 
 class Layout extends Component {
diff --git a/packages/nova-base-components/lib/common/Logo.jsx b/packages/nova-base-components/lib/common/Logo.jsx
index 01cfbd876..09ce34fc4 100644
--- a/packages/nova-base-components/lib/common/Logo.jsx
+++ b/packages/nova-base-components/lib/common/Logo.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { IndexLink } from 'react-router';
 
diff --git a/packages/nova-base-components/lib/common/Newsletter.jsx b/packages/nova-base-components/lib/common/Newsletter.jsx
index ff3c5df41..4888b6fc5 100644
--- a/packages/nova-base-components/lib/common/Newsletter.jsx
+++ b/packages/nova-base-components/lib/common/Newsletter.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser, withMutation, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
 import Formsy from 'formsy-react';
@@ -6,7 +6,6 @@ import { Input } from 'formsy-react-components';
 import { Button } from 'react-bootstrap';
 import Cookie from 'react-cookie';
 import Users from 'meteor/nova:users';
-import { withCurrentUser, withMutation, withMessages } from 'meteor/nova:core';
 
 class Newsletter extends Component {
 
@@ -27,13 +26,13 @@ class Newsletter extends Component {
     }
   }
 
-  subscribeEmail(data) {
-    this.props.addEmailNewsletter({email: data.email}).then(result => {
+  async subscribeEmail(data) {
+    try {
+      const result = await this.props.addEmailNewsletter({email: data.email});
       this.successCallbackSubscription(result);
-    }).catch(error => {
-      console.log(error);
+    } catch(error) {
       this.props.flash(error.message, "error");
-    });
+    }
   }
 
   successCallbackSubscription(result) {
@@ -100,8 +99,6 @@ function showBanner (user) {
   return (
     // showBanner cookie either doesn't exist or is not set to "no"
     Cookie.load('showBanner') !== "no"
-    // and showBanner user setting either doesn't exist or is set to true
-    // && Users.getSetting(user, 'newsletter.showBanner', true)
     // and user is not subscribed to the newsletter already (setting either DNE or is not set to false)
     && !Users.getSetting(user, 'newsletter_subscribeToNewsletter', false)
   );
diff --git a/packages/nova-base-components/lib/common/NewsletterButton.jsx b/packages/nova-base-components/lib/common/NewsletterButton.jsx
index d00ff15cf..767d6dacd 100644
--- a/packages/nova-base-components/lib/common/NewsletterButton.jsx
+++ b/packages/nova-base-components/lib/common/NewsletterButton.jsx
@@ -1,8 +1,7 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withMutation, withCurrentUser, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Button } from 'react-bootstrap';
-import { withMutation, withCurrentUser, withMessages } from 'meteor/nova:core';
 
 class NewsletterButton extends Component {
   constructor(props) {
diff --git a/packages/nova-base-components/lib/common/SearchForm.jsx b/packages/nova-base-components/lib/common/SearchForm.jsx
index 2b0871ccf..65803688b 100644
--- a/packages/nova-base-components/lib/common/SearchForm.jsx
+++ b/packages/nova-base-components/lib/common/SearchForm.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { intlShape } from 'react-intl';
 import Formsy from 'formsy-react';
diff --git a/packages/nova-base-components/lib/common/Vote.jsx b/packages/nova-base-components/lib/common/Vote.jsx
index b3dd30713..20fb267f9 100644
--- a/packages/nova-base-components/lib/common/Vote.jsx
+++ b/packages/nova-base-components/lib/common/Vote.jsx
@@ -1,7 +1,6 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import classNames from 'classnames';
-import { withMessages } from 'meteor/nova:core';
 import { withVote, hasUpvoted, hasDownvoted } from 'meteor/nova:voting';
 
 class Vote extends Component {
diff --git a/packages/nova-base-components/lib/components.js b/packages/nova-base-components/lib/components.js
index 6bb787960..3a5a21463 100644
--- a/packages/nova-base-components/lib/components.js
+++ b/packages/nova-base-components/lib/components.js
@@ -56,10 +56,6 @@ import './categories/Category.jsx';
 import './categories/CategoriesEditForm.jsx';
 import './categories/CategoriesNewForm.jsx';
 
-// permissions
-
-import './permissions/CanDo.jsx';
-
 // users
 
 import './users/UsersSingle.jsx';
diff --git a/packages/nova-base-components/lib/permissions/CanCreatePost.jsx b/packages/nova-base-components/lib/permissions/CanCreatePost.jsx
deleted file mode 100644
index 8f89b85e5..000000000
--- a/packages/nova-base-components/lib/permissions/CanCreatePost.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-// Deprecated way to handle permission in components, check CanDo component
-
-// import Telescope from 'meteor/nova:lib';
-// import React, { PropTypes, Component } from 'react';
-// import { FormattedMessage } from 'react-intl';
-// import Users from 'meteor/nova:users';
-
-// const CanCreatePost = (props, context) => {
-
-//   const currentUser = context.currentUser;
-
-//   const children = props.children;
-//   const UsersAccountForm = Telescope.components.UsersAccountForm;
-
-//   if (!currentUser){
-//     return (
-//       <div className="log-in-message">
-//         <h3><FormattedMessage id="users.please_log_in"/></h3>
-//         <UsersAccountForm/>
-//       </div>
-//     )
-//   } else if (Users.canDo(currentUser, "posts.new")) {
-//     return children;
-//   } else {
-//     return <p><FormattedMessage id="users.cannot_post"/></p>;
-//   }
-// };
-
-// CanCreatePost.contextTypes = {
-//   currentUser: React.PropTypes.object
-// };
-
-// CanCreatePost.displayName = "CanCreatePost";
-
-// module.exports = CanCreatePost;
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/permissions/CanDo.jsx b/packages/nova-base-components/lib/permissions/CanDo.jsx
deleted file mode 100644
index 853a1fa1e..000000000
--- a/packages/nova-base-components/lib/permissions/CanDo.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-// import Telescope from 'meteor/nova:lib';
-// import React, { PropTypes } from 'react';
-// import { FormattedMessage } from 'react-intl';
-// import Users from 'meteor/nova:users';
-// import { withCurrentUser } from 'meteor/nova:core';
-
-// const CanDo = (props, context) => {
-  
-//   // no user login, display the login form
-//   if (!props.currentUser && props.displayNoPermissionMessage) {
-//     return (
-//       <div className="log-in-message">
-//         <h3><FormattedMessage id="users.please_log_in"/></h3>
-//         <Telescope.components.UsersAccountForm />
-//       </div>
-//     );
-//   }
-
-//   // default permission, is the user allowed to perform this action?
-//   let permission = Users.canDo(props.currentUser, props.action);
-
-//   // the permission is about viewing a document, check if the user is allowed
-//   if (props.document && props.action.indexOf('view') > -1) {
-//     // use the permission shortcut canView on the current user and requested document
-//     permission = Users.canView(props.currentUser, props.document);
-//   }
-
-//   // the permission is about editing a document, check if the user is allowed
-//   if (props.document && props.action.indexOf('edit') > -1) {
-//     // use the permission shortcut canEdit on the current user and requested document
-//     permission = Users.canEdit(props.currentUser, props.document);
-//   }
-
-
-//   // the user can perform the intented action in the component: display the component, 
-//   // else: display a not allowed message
-//   if (permission) {
-//     return props.children;
-//   } else {
-//     return props.displayNoPermissionMessage ? <p><FormattedMessage id={props.noPermissionMessage}/></p> : null;
-//   }
-// };
-
-// CanDo.propTypes = {
-//   action: React.PropTypes.string.isRequired,
-//   currentUser: React.PropTypes.object,
-//   document: React.PropTypes.object,
-//   noPermissionMessage: React.PropTypes.string,
-//   displayNoPermissionMessage: React.PropTypes.bool,
-// };
-
-// CanDo.defaultProps = {
-//   noPermissionMessage: 'app.noPermission',
-//   displayNoPermissionMessage: false,
-// };
-
-// CanDo.displayName = "CanDo";
-
-// Telescope.registerComponent('CanDo', CanDo, withCurrentUser);
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/permissions/CanEditPost.jsx b/packages/nova-base-components/lib/permissions/CanEditPost.jsx
deleted file mode 100644
index bb0044ba4..000000000
--- a/packages/nova-base-components/lib/permissions/CanEditPost.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Deprecated way to handle permission in components, check CanDo component
-
-// import React, { PropTypes, Component } from 'react';
-// import Users from 'meteor/nova:users';
-
-// const CanEditPost = ({user, post, children}) => {
-//   if (Users.canEdit(user, post)) {
-//     return children;
-//   } else if (!user){
-//     return <p>Please log in.</p>;
-//   } else {
-//     return <p>Sorry, you do not have permissions to edit this post at this time</p>;
-//   }
-// };
-
-// CanEditPost.propTypes = {
-//   user: React.PropTypes.object,
-//   post: React.PropTypes.object
-// }
-
-// CanEditPost.displayName = "CanEditPost";
-
-// module.exports = CanEditPost;
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/permissions/CanEditUser.jsx b/packages/nova-base-components/lib/permissions/CanEditUser.jsx
deleted file mode 100644
index 31c2df578..000000000
--- a/packages/nova-base-components/lib/permissions/CanEditUser.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Deprecated way to handle permission in components, check CanDo component
-
-// import React, { PropTypes, Component } from 'react';
-// import Users from 'meteor/nova:users';
-
-// const CanEditUser = ({user, userToEdit, children}) => {
-//   if (!user){
-//     return <p>Please log in.</p>;
-//   } else if (Users.canEdit(user, userToEdit)) {
-//     return children;
-//   } else {
-//     return <p>Sorry, you do not have permissions to edit this user at this time</p>;
-//   }
-// };
-
-// CanEditUser.propTypes = {
-//   user: React.PropTypes.object,
-//   userToEdit: React.PropTypes.object
-// }
-
-// CanEditUser.displayName = "CanEditUser";
-
-// module.exports = CanEditUser;
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/permissions/CanView.jsx b/packages/nova-base-components/lib/permissions/CanView.jsx
deleted file mode 100644
index ad12cfa41..000000000
--- a/packages/nova-base-components/lib/permissions/CanView.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-// Deprecated way to handle permission in components, check CanDo component
-
-// import React, { PropTypes, Component } from 'react';
-// import Users from 'meteor/nova:users';
-
-// const CanView = ({user, children}) => {
-//   if (Users.canDo(user, "posts.view.approved.all")) {
-//     return children;
-//   } else if (!user){
-//     return <p>Please log in.</p>;
-//   } else {
-//     return <p>Sorry, you do not have permissions to post at this time</p>;
-//   }
-// };
-
-// CanView.propTypes = {
-//   user: React.PropTypes.object
-// }
-
-// CanView.displayName = "CanView";
-
-// module.exports = CanView;
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/permissions/CanViewPost.jsx b/packages/nova-base-components/lib/permissions/CanViewPost.jsx
deleted file mode 100644
index 02046d7d5..000000000
--- a/packages/nova-base-components/lib/permissions/CanViewPost.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Deprecated way to handle permission in components, check CanDo component
-
-// import React, { PropTypes, Component } from 'react';
-// import Users from 'meteor/nova:users';
-
-// const CanViewPost = ({user, post, children}) => {
-//   if (Users.canView(this.props.user, this.props.document)) {
-//     return this.props.children;
-//   } else if (!this.props.user){
-//     return <p>Please log in.</p>;
-//   } else {
-//     return <p>Sorry, you do not have permissions to post at this time</p>;
-//   }
-// };
-
-// CanViewPost.propTypes = {
-//   user: React.PropTypes.object,
-//   post: React.PropTypes.object
-// }
-
-// CanViewPost.displayName = "CanViewPost";
-
-// module.exports = CanViewPost;
\ No newline at end of file
diff --git a/packages/nova-base-components/lib/posts/PostsCategories.jsx b/packages/nova-base-components/lib/posts/PostsCategories.jsx
index 8c3923791..a93dd290a 100644
--- a/packages/nova-base-components/lib/posts/PostsCategories.jsx
+++ b/packages/nova-base-components/lib/posts/PostsCategories.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { Link } from 'react-router';
 
diff --git a/packages/nova-base-components/lib/posts/PostsCommenters.jsx b/packages/nova-base-components/lib/posts/PostsCommenters.jsx
index 539e6bd4c..26b026238 100644
--- a/packages/nova-base-components/lib/posts/PostsCommenters.jsx
+++ b/packages/nova-base-components/lib/posts/PostsCommenters.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { Link } from 'react-router';
 import Posts from "meteor/nova:posts";
diff --git a/packages/nova-base-components/lib/posts/PostsDay.jsx b/packages/nova-base-components/lib/posts/PostsDay.jsx
index eb4732f2c..54c09d42c 100644
--- a/packages/nova-base-components/lib/posts/PostsDay.jsx
+++ b/packages/nova-base-components/lib/posts/PostsDay.jsx
@@ -1,11 +1,11 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 
 class PostsDay extends Component {
 
   render() {
 
-    const {date, networkStatus, posts} = this.props;
+    const {date, posts} = this.props;
     const noPosts = posts.length === 0;
 
     return (
diff --git a/packages/nova-base-components/lib/posts/PostsEditForm.jsx b/packages/nova-base-components/lib/posts/PostsEditForm.jsx
index 58a542da6..84f69dd30 100644
--- a/packages/nova-base-components/lib/posts/PostsEditForm.jsx
+++ b/packages/nova-base-components/lib/posts/PostsEditForm.jsx
@@ -1,9 +1,8 @@
-import { Components, registerComponent, getFragment } from 'meteor/nova:core';
+import { Components, registerComponent, getFragment, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { intlShape } from 'react-intl';
 import Posts from "meteor/nova:posts";
 import { withRouter } from 'react-router'
-import { ShowIf, withMessages } from 'meteor/nova:core';
 
 class PostsEditForm extends Component {
 
diff --git a/packages/nova-base-components/lib/posts/PostsHome.jsx b/packages/nova-base-components/lib/posts/PostsHome.jsx
index 706716a77..5a29dfbc4 100644
--- a/packages/nova-base-components/lib/posts/PostsHome.jsx
+++ b/packages/nova-base-components/lib/posts/PostsHome.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 
 const PostsHome = (props, context) => {
diff --git a/packages/nova-base-components/lib/posts/PostsItem.jsx b/packages/nova-base-components/lib/posts/PostsItem.jsx
index 4952e495f..bde2375e1 100644
--- a/packages/nova-base-components/lib/posts/PostsItem.jsx
+++ b/packages/nova-base-components/lib/posts/PostsItem.jsx
@@ -1,10 +1,8 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, ModalTrigger } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, FormattedRelative } from 'react-intl';
-import { ModalTrigger } from "meteor/nova:core";
 import { Link } from 'react-router';
 import Posts from "meteor/nova:posts";
-// import { withCurrentUser } from 'meteor/nova:core';
 
 class PostsItem extends Component {
 
diff --git a/packages/nova-base-components/lib/posts/PostsList.jsx b/packages/nova-base-components/lib/posts/PostsList.jsx
index 4a784c665..c137d492f 100644
--- a/packages/nova-base-components/lib/posts/PostsList.jsx
+++ b/packages/nova-base-components/lib/posts/PostsList.jsx
@@ -1,8 +1,6 @@
-import { Components, getRawComponent, registerComponent } from 'meteor/nova:lib';
+import { Components, getRawComponent, registerComponent, withList, withCurrentUser } from 'meteor/nova:core';
 import React from 'react';
-import { withList } from 'meteor/nova:core';
 import Posts from 'meteor/nova:posts';
-import { withCurrentUser } from 'meteor/nova:core';
 
 const PostsList = (props) => {
 
diff --git a/packages/nova-base-components/lib/posts/PostsListHeader.jsx b/packages/nova-base-components/lib/posts/PostsListHeader.jsx
index d5e29ac89..5e20b2571 100644
--- a/packages/nova-base-components/lib/posts/PostsListHeader.jsx
+++ b/packages/nova-base-components/lib/posts/PostsListHeader.jsx
@@ -1,6 +1,5 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
-import Categories from "meteor/nova:categories";
 
 const PostsListHeader = () => {
 
diff --git a/packages/nova-base-components/lib/posts/PostsLoadMore.jsx b/packages/nova-base-components/lib/posts/PostsLoadMore.jsx
index a3778b13c..64770627c 100644
--- a/packages/nova-base-components/lib/posts/PostsLoadMore.jsx
+++ b/packages/nova-base-components/lib/posts/PostsLoadMore.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
diff --git a/packages/nova-base-components/lib/posts/PostsLoading.jsx b/packages/nova-base-components/lib/posts/PostsLoading.jsx
index 883432c9e..16af9ac97 100644
--- a/packages/nova-base-components/lib/posts/PostsLoading.jsx
+++ b/packages/nova-base-components/lib/posts/PostsLoading.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
 
 const PostsLoading = props => {
diff --git a/packages/nova-base-components/lib/posts/PostsNewButton.jsx b/packages/nova-base-components/lib/posts/PostsNewButton.jsx
index 1085cc171..679f34fa8 100644
--- a/packages/nova-base-components/lib/posts/PostsNewButton.jsx
+++ b/packages/nova-base-components/lib/posts/PostsNewButton.jsx
@@ -1,10 +1,7 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { Button } from 'react-bootstrap';
-import { ModalTrigger } from "meteor/nova:core";
-import Posts from "meteor/nova:posts";
-import { withCurrentUser } from 'meteor/nova:core';
 
 const PostsNewButton = (props, context) => {
 
@@ -28,4 +25,4 @@ PostsNewButton.contextTypes = {
   intl: intlShape
 };
 
-registerComponent('PostsNewButton', PostsNewButton, withCurrentUser);
\ No newline at end of file
+registerComponent('PostsNewButton', PostsNewButton, withCurrentUser);
diff --git a/packages/nova-base-components/lib/posts/PostsNewForm.jsx b/packages/nova-base-components/lib/posts/PostsNewForm.jsx
index 98aec3a25..29fa7172a 100644
--- a/packages/nova-base-components/lib/posts/PostsNewForm.jsx
+++ b/packages/nova-base-components/lib/posts/PostsNewForm.jsx
@@ -1,5 +1,4 @@
-import { Components, registerComponent, getRawComponent, getFragment } from 'meteor/nova:core';
-import { ShowIf, withMessages } from 'meteor/nova:core';
+import { Components, registerComponent, getRawComponent, getFragment, withMessages } from 'meteor/nova:core';
 import Posts from "meteor/nova:posts";
 import React, { PropTypes, Component } from 'react';
 import { intlShape } from 'react-intl';
@@ -39,4 +38,4 @@ PostsNewForm.contextTypes = {
 
 PostsNewForm.displayName = "PostsNewForm";
 
-registerComponent('PostsNewForm', PostsNewForm, withRouter, withMessages);
\ No newline at end of file
+registerComponent('PostsNewForm', PostsNewForm, withRouter, withMessages);
diff --git a/packages/nova-base-components/lib/posts/PostsNoMore.jsx b/packages/nova-base-components/lib/posts/PostsNoMore.jsx
index 420a422fe..80086c1db 100644
--- a/packages/nova-base-components/lib/posts/PostsNoMore.jsx
+++ b/packages/nova-base-components/lib/posts/PostsNoMore.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from "react";
 import { FormattedMessage } from "react-intl";
 
diff --git a/packages/nova-base-components/lib/posts/PostsNoResults.jsx b/packages/nova-base-components/lib/posts/PostsNoResults.jsx
index f9e6c96e0..d3ea47c93 100644
--- a/packages/nova-base-components/lib/posts/PostsNoResults.jsx
+++ b/packages/nova-base-components/lib/posts/PostsNoResults.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import { FormattedMessage } from "react-intl";
 
diff --git a/packages/nova-base-components/lib/posts/PostsSingle.jsx b/packages/nova-base-components/lib/posts/PostsSingle.jsx
index d093b518c..d9a5a03fe 100644
--- a/packages/nova-base-components/lib/posts/PostsSingle.jsx
+++ b/packages/nova-base-components/lib/posts/PostsSingle.jsx
@@ -1,6 +1,5 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
-import Posts from "meteor/nova:posts";
 
 const PostsSingle = (props, context) => {
   return <Components.PostsPage documentId={props.params._id} />
@@ -8,4 +7,4 @@ const PostsSingle = (props, context) => {
 
 PostsSingle.displayName = "PostsSingle";
 
-registerComponent('PostsSingle', PostsSingle);
\ No newline at end of file
+registerComponent('PostsSingle', PostsSingle);
diff --git a/packages/nova-base-components/lib/posts/PostsStats.jsx b/packages/nova-base-components/lib/posts/PostsStats.jsx
index 741fe1e2b..c3ac83cdb 100644
--- a/packages/nova-base-components/lib/posts/PostsStats.jsx
+++ b/packages/nova-base-components/lib/posts/PostsStats.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
 
 const PostsStats = ({post}) => {
diff --git a/packages/nova-base-components/lib/posts/PostsThumbnail.jsx b/packages/nova-base-components/lib/posts/PostsThumbnail.jsx
index 6591ba3d3..2da6c9e65 100644
--- a/packages/nova-base-components/lib/posts/PostsThumbnail.jsx
+++ b/packages/nova-base-components/lib/posts/PostsThumbnail.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React from 'react';
 import Posts from "meteor/nova:posts";
 
diff --git a/packages/nova-base-components/lib/posts/PostsViews.jsx b/packages/nova-base-components/lib/posts/PostsViews.jsx
index aabc3a51b..19ea73ae2 100644
--- a/packages/nova-base-components/lib/posts/PostsViews.jsx
+++ b/packages/nova-base-components/lib/posts/PostsViews.jsx
@@ -1,11 +1,10 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent, withCurrentUser } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { DropdownButton, MenuItem } from 'react-bootstrap';
 import { LinkContainer } from 'react-router-bootstrap';
 import { withRouter } from 'react-router'
 import Users from 'meteor/nova:users';
-import { withCurrentUser } from 'meteor/nova:core';
 
 const PostsViews = (props, context) => {
 
diff --git a/packages/nova-base-components/lib/users/UsersAccount.jsx b/packages/nova-base-components/lib/users/UsersAccount.jsx
index c23ebc1b0..e21dc79ed 100644
--- a/packages/nova-base-components/lib/users/UsersAccount.jsx
+++ b/packages/nova-base-components/lib/users/UsersAccount.jsx
@@ -1,6 +1,5 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser } from 'meteor/nova:core';
 import React from 'react';
-import { withCurrentUser } from 'meteor/nova:core';
 
 const UsersAccount = (props, context) => {
   // note: terms is as the same as a document-shape the SmartForm edit-mode expects to receive
diff --git a/packages/nova-base-components/lib/users/UsersAccountForm.jsx b/packages/nova-base-components/lib/users/UsersAccountForm.jsx
index 7147f4be7..7c83d89ca 100644
--- a/packages/nova-base-components/lib/users/UsersAccountForm.jsx
+++ b/packages/nova-base-components/lib/users/UsersAccountForm.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { Button, FormControl } from 'react-bootstrap';
 import { Accounts } from 'meteor/std:accounts-ui';
diff --git a/packages/nova-base-components/lib/users/UsersAccountMenu.jsx b/packages/nova-base-components/lib/users/UsersAccountMenu.jsx
index 3981f01ea..050406abc 100644
--- a/packages/nova-base-components/lib/users/UsersAccountMenu.jsx
+++ b/packages/nova-base-components/lib/users/UsersAccountMenu.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Dropdown } from 'react-bootstrap';
diff --git a/packages/nova-base-components/lib/users/UsersAvatar.jsx b/packages/nova-base-components/lib/users/UsersAvatar.jsx
index 685f0affb..c7194d81e 100644
--- a/packages/nova-base-components/lib/users/UsersAvatar.jsx
+++ b/packages/nova-base-components/lib/users/UsersAvatar.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import Users from 'meteor/nova:users';
 import { Link } from 'react-router';
diff --git a/packages/nova-base-components/lib/users/UsersEditForm.jsx b/packages/nova-base-components/lib/users/UsersEditForm.jsx
index 41f8b2482..bd3732eda 100644
--- a/packages/nova-base-components/lib/users/UsersEditForm.jsx
+++ b/packages/nova-base-components/lib/users/UsersEditForm.jsx
@@ -1,8 +1,7 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
 import Users from 'meteor/nova:users';
-import { ShowIf, withCurrentUser, withMessages } from 'meteor/nova:core';
 
 const UsersEditForm = (props, context) => {
   return (
diff --git a/packages/nova-base-components/lib/users/UsersMenu.jsx b/packages/nova-base-components/lib/users/UsersMenu.jsx
index ffd91a470..22ea54c23 100644
--- a/packages/nova-base-components/lib/users/UsersMenu.jsx
+++ b/packages/nova-base-components/lib/users/UsersMenu.jsx
@@ -1,11 +1,10 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withCurrentUser } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Meteor } from 'meteor/meteor';
 import { Dropdown, MenuItem } from 'react-bootstrap';
 import { LinkContainer } from 'react-router-bootstrap';
 import Users from 'meteor/nova:users';
-import { withCurrentUser } from 'meteor/nova:core';
 import { withApollo } from 'react-apollo';
 
 class UsersMenu extends Component {
diff --git a/packages/nova-base-components/lib/users/UsersName.jsx b/packages/nova-base-components/lib/users/UsersName.jsx
index 43da7dfe1..dd002370f 100644
--- a/packages/nova-base-components/lib/users/UsersName.jsx
+++ b/packages/nova-base-components/lib/users/UsersName.jsx
@@ -1,4 +1,4 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import Users from 'meteor/nova:users';
 import { Link } from 'react-router';
diff --git a/packages/nova-base-components/lib/users/UsersProfile.jsx b/packages/nova-base-components/lib/users/UsersProfile.jsx
index 1624781b3..a6c9833c4 100644
--- a/packages/nova-base-components/lib/users/UsersProfile.jsx
+++ b/packages/nova-base-components/lib/users/UsersProfile.jsx
@@ -1,9 +1,8 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent, withDocument, withCurrentUser } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { FormattedMessage } from 'react-intl';
 import Users from 'meteor/nova:users';
 import { Link } from 'react-router';
-import { ShowIf, withDocument, withCurrentUser } from 'meteor/nova:core';
 
 const UsersProfile = (props) => {
   if (props.loading) {
diff --git a/packages/nova-base-components/lib/users/UsersResetPassword.jsx b/packages/nova-base-components/lib/users/UsersResetPassword.jsx
index a13874e30..020339c86 100644
--- a/packages/nova-base-components/lib/users/UsersResetPassword.jsx
+++ b/packages/nova-base-components/lib/users/UsersResetPassword.jsx
@@ -1,9 +1,8 @@
-import { registerComponent } from 'meteor/nova:lib';
+import { registerComponent, withCurrentUser } from 'meteor/nova:core';
 import React, { Component } from 'react';
 import { Accounts, STATES } from 'meteor/std:accounts-ui';
 import { T9n } from 'meteor/softwarerero:accounts-t9n';
 import { Link } from 'react-router';
-import { withCurrentUser } from 'meteor/nova:core';
 
 class UsersResetPassword extends Component {
   componentDidMount() {
diff --git a/packages/nova-base-components/lib/users/UsersSingle.jsx b/packages/nova-base-components/lib/users/UsersSingle.jsx
index a014f3550..c536279e4 100644
--- a/packages/nova-base-components/lib/users/UsersSingle.jsx
+++ b/packages/nova-base-components/lib/users/UsersSingle.jsx
@@ -1,6 +1,5 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React from 'react';
-import Users from 'meteor/nova:users';
 
 const UsersSingle = (props, context) => {
   return <Components.UsersProfile userId={props.params._id} slug={props.params.slug} />
@@ -8,4 +7,4 @@ const UsersSingle = (props, context) => {
 
 UsersSingle.displayName = "UsersSingle";
 
-registerComponent('UsersSingle', UsersSingle);
\ No newline at end of file
+registerComponent('UsersSingle', UsersSingle);
diff --git a/packages/nova-base-styles/lib/stylesheets/bootstrap.css b/packages/nova-base-styles/lib/stylesheets/bootstrap.css
index 79742bda3..5279924d5 100644
--- a/packages/nova-base-styles/lib/stylesheets/bootstrap.css
+++ b/packages/nova-base-styles/lib/stylesheets/bootstrap.css
@@ -6387,4 +6387,4 @@ a.text-danger:focus, a.text-danger:hover {
     display: none !important;
   }
 }
-/*# sourceMappingURL=bootstrap.css.map */
\ No newline at end of file
+/*# sourceMappingURL=bootstrap.css.map */
diff --git a/packages/nova-categories/lib/server/publications.js b/packages/nova-categories/lib/server/publications.js
deleted file mode 100644
index b3b6ed308..000000000
--- a/packages/nova-categories/lib/server/publications.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// import Posts from "meteor/nova:posts";
-// import Users from 'meteor/nova:users';
-// import Categories from "../collection.js";
-
-// Meteor.publish('categories', function() {
-
-//   const currentUser = this.userId && Users.findOne(this.userId);
-
-//   if(Users.canDo(currentUser, "posts.view.approved.all")){
-
-//     var categories = Categories.find({}, {fields: Categories.publishedFields.list});
-//     var publication = this;
-
-//     categories.forEach(function (category) {
-//       var childrenCategories = category.getChildren();
-//       var categoryIds = [category._id].concat(_.pluck(childrenCategories, "_id"));
-//       var cursor = Posts.find({$and: [{categories: {$in: categoryIds}}, {status: Posts.config.STATUS_APPROVED}]});
-//       // Counts.publish(publication, category.getCounterName(), cursor, { noReady: true });
-//     });
-
-//     return categories;
-//   }
-//   return [];
-// });
diff --git a/packages/nova-comments/lib/callbacks/callbacks_comments_edit.js b/packages/nova-comments/lib/callbacks/callbacks_comments_edit.js
index 15a28c61d..291c9e1bc 100644
--- a/packages/nova-comments/lib/callbacks/callbacks_comments_edit.js
+++ b/packages/nova-comments/lib/callbacks/callbacks_comments_edit.js
@@ -1,6 +1,4 @@
 import marked from 'marked';
-import Posts from "meteor/nova:posts";
-import Users from 'meteor/nova:users';
 import { addCallback, Utils } from 'meteor/nova:core';
 
 // ------------------------------------- comments.edit.sync -------------------------------- //
diff --git a/packages/nova-comments/lib/callbacks/callbacks_comments_new.js b/packages/nova-comments/lib/callbacks/callbacks_comments_new.js
index 8eed21c39..7c6b0b2e1 100644
--- a/packages/nova-comments/lib/callbacks/callbacks_comments_new.js
+++ b/packages/nova-comments/lib/callbacks/callbacks_comments_new.js
@@ -11,8 +11,7 @@ function CommentsNewRateLimit (comment, user) {
   if (!Users.isAdmin(user)) {
     const timeSinceLastComment = Users.timeSinceLast(user, Comments);
     const commentInterval = Math.abs(parseInt(getSetting('commentInterval',15)));
-    console.log(timeSinceLastComment);
-    console.log(commentInterval);
+
     // check that user waits more than 15 seconds between comments
     if((timeSinceLastComment < commentInterval)) {
       throw new Error(Utils.encodeIntlError({id: "comments.rate_limit_error", value: commentInterval-timeSinceLastComment}));
diff --git a/packages/nova-comments/lib/callbacks/callbacks_comments_remove.js b/packages/nova-comments/lib/callbacks/callbacks_comments_remove.js
index 0b07ca98c..6d4cf58e3 100644
--- a/packages/nova-comments/lib/callbacks/callbacks_comments_remove.js
+++ b/packages/nova-comments/lib/callbacks/callbacks_comments_remove.js
@@ -1,8 +1,7 @@
-import { removeMutation } from 'meteor/nova:core';
+import { removeMutation, addCallback } from 'meteor/nova:core';
 import Posts from "meteor/nova:posts";
 import Comments from '../collection.js';
 import Users from 'meteor/nova:users';
-import { addCallback } from 'meteor/nova:core';
 
 const CommentsRemovePostCommenters = (comment, currentUser) => {
   const { userId, postId } = comment;
@@ -45,4 +44,4 @@ const CommentsRemoveChildrenComments = (comment, currentUser) => {
   return comment;
 };
 
-addCallback("comments.remove.async", CommentsRemoveChildrenComments);
\ No newline at end of file
+addCallback("comments.remove.async", CommentsRemoveChildrenComments);
diff --git a/packages/nova-comments/lib/callbacks/callbacks_other.js b/packages/nova-comments/lib/callbacks/callbacks_other.js
index ae21f57c2..9184f0719 100644
--- a/packages/nova-comments/lib/callbacks/callbacks_other.js
+++ b/packages/nova-comments/lib/callbacks/callbacks_other.js
@@ -3,7 +3,7 @@ import { addCallback } from 'meteor/nova:core';
 
 function UsersRemoveDeleteComments (user, options) {
   if (options.deleteComments) {
-    var deletedComments = Comments.remove({userId: userId});
+    Comments.remove({userId: user._id});
   } else {
     // not sure if anything should be done in that scenario yet
     // Comments.update({userId: userId}, {$set: {author: "\[deleted\]"}}, {multi: true});
diff --git a/packages/nova-comments/lib/helpers.js b/packages/nova-comments/lib/helpers.js
index fe5ae8b71..0012031dd 100644
--- a/packages/nova-comments/lib/helpers.js
+++ b/packages/nova-comments/lib/helpers.js
@@ -1,4 +1,3 @@
-// import Telescope from 'meteor/nova:lib';
 import Comments from './collection.js';
 import Posts from 'meteor/nova:posts';
 import Users from 'meteor/nova:users';
diff --git a/packages/nova-core/lib/components/ContextPasser.jsx b/packages/nova-core/lib/components/ContextPasser.jsx
deleted file mode 100644
index 94549ad5f..000000000
--- a/packages/nova-core/lib/components/ContextPasser.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { registerComponent } from 'meteor/nova:lib';
-import React, { PropTypes, Component } from 'react';
-
-class ContextPasser extends Component {
-
-  getChildContext() {
-    return {
-      closeCallback: this.props.closeCallback,
-      events: this.props.events,
-      messages: this.props.messages,
-    };
-  }
-
-  render() {
-    return this.props.children;
-  }
-}
-
-ContextPasser.propTypes = {
-  closeCallback: React.PropTypes.func,
-  events: React.PropTypes.object,
-  messages: React.PropTypes.object,  
-};
-
-ContextPasser.childContextTypes = {
-  closeCallback: React.PropTypes.func,
-  events: React.PropTypes.object,
-  messages: React.PropTypes.object,
-};
-
-registerComponent('ContextPasser', ContextPasser);
-
-export default ContextPasser;
-module.exports = ContextPasser;
\ No newline at end of file
diff --git a/packages/nova-core/lib/components/Layout.jsx b/packages/nova-core/lib/components/Layout.jsx
deleted file mode 100644
index b705d4443..000000000
--- a/packages/nova-core/lib/components/Layout.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { registerComponent } from 'meteor/nova:lib';
-import React from 'react';
-
-const Layout = props => {
-  return (
-    <div>{props.children}</div>
-  );
-}
-
-Layout.displayName = "Layout";
-
-registerComponent('Layout', Layout);
-
-export default Layout;
\ No newline at end of file
diff --git a/packages/nova-core/lib/components/ModalTrigger.jsx b/packages/nova-core/lib/components/ModalTrigger.jsx
index 789d7ec4d..d0c57fd9a 100644
--- a/packages/nova-core/lib/components/ModalTrigger.jsx
+++ b/packages/nova-core/lib/components/ModalTrigger.jsx
@@ -1,6 +1,5 @@
 import { registerComponent } from 'meteor/nova:lib';
 import React, { PropTypes, Component } from 'react';
-import ContextPasser from './ContextPasser.jsx'
 import { Modal } from 'react-bootstrap';
 
 class ModalTrigger extends Component {
@@ -60,4 +59,4 @@ ModalTrigger.defaultProps = {
 
 registerComponent('ModalTrigger', ModalTrigger);
 
-export default ModalTrigger;
\ No newline at end of file
+export default ModalTrigger;
diff --git a/packages/nova-core/lib/containers/withApp.js b/packages/nova-core/lib/containers/withApp.js
deleted file mode 100644
index ab188094d..000000000
--- a/packages/nova-core/lib/containers/withApp.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// import Users from 'meteor/nova:users';
-// import React from 'react';
-// import { graphql } from 'react-apollo';
-// import gql from 'graphql-tag';
-// import hoistStatics from 'hoist-non-react-statics';
-// import { Utils } from 'meteor/nova:lib';
-// 
-// const withApp = WrappedComponent => {
-// 
-//   class WithApp extends React.Component {
-//     constructor(...args) {
-//       super(...args);
-//       
-//       this.preloadedFields = ['_id'];
-//     }
-//     
-//     componentWillMount() {
-//       this.preloadedFields = _.compact(_.map(Users.simpleSchema()._schema, (field, fieldName) => {
-//         return field.preload ? fieldName : undefined;
-//       }));
-//     }
-//     
-//     render() {
-//       
-//       const ComponentWithData = graphql(
-//         gql`query getCurrentUser {
-//           currentUser {
-//             ${this.preloadedFields.join('\n')}
-//           }
-//         }
-//         `, {
-//           options(ownProps) {
-//             return {
-//               variables: {},
-//               // pollInterval: 20000,
-//             };
-//           },
-//           props(props) {
-//             const {data: {loading, currentUser}} = props;
-//             return {
-//               loading,
-//               currentUser,
-//             };
-//           },
-//         }
-//       )(WrappedComponent);
-//       
-//       return <ComponentWithData {...this.props} />
-//     }
-//   }
-//   
-//   WithApp.displayName = `withApp(${Utils.getComponentDisplayName(WrappedComponent)})`
-//   WithApp.WrappedComponent = WrappedComponent
-// 
-//   return hoistStatics(WithApp, WrappedComponent);
-// };
-// 
-// export default withApp;
diff --git a/packages/nova-core/lib/modules.js b/packages/nova-core/lib/modules.js
index 09b7f69c1..7b8cd7d12 100644
--- a/packages/nova-core/lib/modules.js
+++ b/packages/nova-core/lib/modules.js
@@ -4,12 +4,10 @@ export { Components, registerComponent, replaceComponent, getRawComponent, getCo
 import './callbacks.js';
 
 export { default as App } from "./components/App.jsx";
-export { default as Layout } from "./components/Layout.jsx";
 export { default as Icon } from "./components/Icon.jsx";
 export { default as Loading } from "./components/Loading.jsx";
 export { default as ShowIf } from "./components/ShowIf.jsx";
 export { default as ModalTrigger } from './components/ModalTrigger.jsx';
-export { default as ContextPasser } from './components/ContextPasser.jsx';
 export { default as withMessages } from "./containers/withMessages.js";
 export { default as withList } from './containers/withList.js';
 export { default as withDocument } from './containers/withDocument.js';
diff --git a/packages/nova-debug/lib/components/Emails.jsx b/packages/nova-debug/lib/components/Emails.jsx
index 329d8ea1b..94a7b0fa9 100644
--- a/packages/nova-debug/lib/components/Emails.jsx
+++ b/packages/nova-debug/lib/components/Emails.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import { Button } from 'react-bootstrap';
 import NovaEmail from 'meteor/nova:email';
diff --git a/packages/nova-debug/lib/globals.js b/packages/nova-debug/lib/globals.js
index 29ea6b18c..8cccc83cf 100644
--- a/packages/nova-debug/lib/globals.js
+++ b/packages/nova-debug/lib/globals.js
@@ -1,12 +1,10 @@
 /* eslint-disable no-undef */
 
-import TelescopeImport from 'meteor/nova:lib';
 import PostsImport from "meteor/nova:posts";
 import CommentsImport from "meteor/nova:comments";
 import UsersImport from "meteor/nova:users";
 import CategoriesImport from "meteor/nova:categories";
 
-Telescope = TelescopeImport;
 Posts = PostsImport;
 Comments = CommentsImport;
 Users = UsersImport;
diff --git a/packages/nova-email/lib/server/email.js b/packages/nova-email/lib/server/email.js
index b7ae0f12a..856af0a57 100644
--- a/packages/nova-email/lib/server/email.js
+++ b/packages/nova-email/lib/server/email.js
@@ -2,7 +2,7 @@ import NovaEmail from '../namespace.js';
 import Juice from 'juice';
 import htmlToText from 'html-to-text';
 import Handlebars from 'handlebars';
-import { Utils, getSetting } from 'meteor/nova:lib';
+import { Utils, getSetting } from 'meteor/nova:lib'; // import from nova:lib because nova:core is not loaded yet
 
 NovaEmail.templates = {};
 
diff --git a/packages/nova-embedly/lib/components/EmbedlyURL.jsx b/packages/nova-embedly/lib/components/EmbedlyURL.jsx
index 3dcc00ea3..3c9f30109 100644
--- a/packages/nova-embedly/lib/components/EmbedlyURL.jsx
+++ b/packages/nova-embedly/lib/components/EmbedlyURL.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/nova:lib';
+import { Components, registerComponent } from 'meteor/nova:core';
 import { withMutation } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
 import FRC from 'formsy-react-components';
diff --git a/packages/nova-events/lib/helpers.js b/packages/nova-events/lib/helpers.js
index 366bfb9a0..95b09add0 100644
--- a/packages/nova-events/lib/helpers.js
+++ b/packages/nova-events/lib/helpers.js
@@ -84,8 +84,8 @@ export const requestAnalyticsAsync = (hook, document, user) => {
       };
       
       // uncomment for debug
-      console.log(`// dispatching identify on "${hook}" (user ${userId})`);
-      console.log(data);
+      // console.log(`// dispatching identify on "${hook}" (user ${userId})`);
+      // console.log(data);
       
       analytics.identify(data);
       
@@ -100,8 +100,8 @@ export const requestAnalyticsAsync = (hook, document, user) => {
       };
       
       // uncomment for debug
-      console.log(`// dispatching track on "${hook}"`);
-      console.log(data);
+      // console.log(`// dispatching track on "${hook}"`);
+      // console.log(data);
       
       analytics.track(data);  
     }
diff --git a/packages/nova-i18n-en-us/lib/en_US.js b/packages/nova-i18n-en-us/lib/en_US.js
index efaea9edb..05c6ff698 100644
--- a/packages/nova-i18n-en-us/lib/en_US.js
+++ b/packages/nova-i18n-en-us/lib/en_US.js
@@ -43,6 +43,7 @@ addStrings('en', {
   "posts.unsubscribed": "You have unsubscribed from “{name}” comments.",
   "posts.subscribed_posts" : "Posts subscribed to",
   "posts.link_already_posted": "This link has already been posted.",
+  "posts.max_per_day": "Sorry you cannot submit more than {value} posts per day.",
 
   "comments.comments": "Comments",
   "comments.count": "{count, plural, =0 {No comments} one {# comment} other {# comments}}",
diff --git a/packages/nova-newsletter/lib/components/NewsletterSubscribe.jsx b/packages/nova-newsletter/lib/components/NewsletterSubscribe.jsx
index db731ce6f..78d82e67a 100644
--- a/packages/nova-newsletter/lib/components/NewsletterSubscribe.jsx
+++ b/packages/nova-newsletter/lib/components/NewsletterSubscribe.jsx
@@ -1,6 +1,5 @@
-import { Components } from 'meteor/nova:lib';
+import { Components, withMessages } from 'meteor/nova:core';
 import React, { PropTypes, Component } from 'react';
-import { withMessages } from 'meteor/nova:core';
 import { intlShape } from 'react-intl';
 
 // this component is used as a custom controller in user's account edit (cf. ./custom_fields.js)
diff --git a/packages/nova-posts/lib/callbacks/callbacks_other.js b/packages/nova-posts/lib/callbacks/callbacks_other.js
index f64fdcf02..553f187ff 100644
--- a/packages/nova-posts/lib/callbacks/callbacks_other.js
+++ b/packages/nova-posts/lib/callbacks/callbacks_other.js
@@ -1,4 +1,4 @@
-import Telescope from 'meteor/nova:lib';
+import Telescope from 'meteor/nova:core';
 import Posts from '../collection.js'
 import Users from 'meteor/nova:users';
 import { addCallback } from 'meteor/nova:core';
diff --git a/packages/nova-posts/lib/callbacks/callbacks_posts_new.js b/packages/nova-posts/lib/callbacks/callbacks_posts_new.js
index 7154a16f5..1acbca822 100644
--- a/packages/nova-posts/lib/callbacks/callbacks_posts_new.js
+++ b/packages/nova-posts/lib/callbacks/callbacks_posts_new.js
@@ -27,7 +27,7 @@ function PostsNewRateLimit (post, user) {
 
     // check that the user doesn't post more than Y posts per day
     if(numberOfPostsInPast24Hours > maxPostsPer24Hours)
-      throw new Error(605, 'sorry_you_cannot_submit_more_than'+maxPostsPer24Hours+'posts_per_day');
+      throw new Error(Utils.encodeIntlError({id: "posts.max_per_day", value: postInterval-timeSinceLastPost}));
 
   }
 
diff --git a/packages/nova-posts/lib/server.js b/packages/nova-posts/lib/server.js
index 88cc941a9..8038045c0 100644
--- a/packages/nova-posts/lib/server.js
+++ b/packages/nova-posts/lib/server.js
@@ -3,4 +3,7 @@ import Posts from './modules.js';
 import './server/routes.js';
 import './server/cron.js';
 
-export default Posts;
\ No newline at end of file
+// index
+Posts._ensureIndex({"status": 1, "postedAt": 1});
+
+export default Posts;
diff --git a/packages/nova-posts/lib/server/publications.js b/packages/nova-posts/lib/server/publications.js
deleted file mode 100644
index e613e0bf2..000000000
--- a/packages/nova-posts/lib/server/publications.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// import Comments from "meteor/nova:comments";
-import Users from 'meteor/nova:users';
-import { Counts } from 'meteor/tmeasday:publish-counts';
-import Posts from '../collection.js';
-import { runCallbacks } from 'meteor/nova:core';
-
-Posts._ensureIndex({"status": 1, "postedAt": 1});
-
-// ------------------------------------- Helpers -------------------------------- //
-
-/**
- * @summary Get all users relevant to a list of posts
- * (authors of the listed posts, and first four commenters of each post)
- * @param {Object} posts
- */
-const getPostsListUsers = posts => {
-
-  // add the userIds of each post authors
-  let userIds = _.pluck(posts.fetch(), 'userId');
-
-  // for each post, also add first four commenter's userIds to userIds array
-  posts.forEach(function (post) {
-    userIds = userIds.concat(_.first(post.commenters,4));
-  });
-
-  userIds = _.unique(userIds);
-
-  return Users.find({_id: {$in: userIds}}, {fields: Users.publishedFields.list});
-
-};
-
-/**
- * @summary Get all users relevant to a single post
- * (author of the current post, authors of its comments, and upvoters & downvoters of the post)
- * @param {Object} post
- */
-const getSinglePostUsers = post => {
-
-  let users = [post.userId]; // publish post author's ID
-
-  /*
-  NOTE: to avoid circular dependencies between nova:posts and nova:comments,
-  use callback hook to get comment authors
-  */
-  users = runCallbacks("posts.single.getUsers", users, post);
-
-  // add upvoters
-  if (post.upvoters && post.upvoters.length) {
-    users = users.concat(post.upvoters);
-  }
-
-  // add downvoters
-  if (post.downvoters && post.downvoters.length) {
-    users = users.concat(post.downvoters);
-  }
-
-  // remove any duplicate IDs
-  users = _.unique(users);
-
-  return Users.find({_id: {$in: users}}, {fields: Users.publishedFields.list});
-};
-
-// ------------------------------------- Publications -------------------------------- //
-
-/**
- * @summary Publish a list of posts, along with the users corresponding to these posts
- * @param {Object} terms
- */
-// Meteor.publish('posts.list', function (terms) {
-// 
-//   // this.unblock(); // causes bug where publication returns 0 results
-// 
-//   this.autorun(function () {
-// 
-//     const currentUser = this.userId && Users.findOne(this.userId);
-// 
-//     terms.currentUserId = this.userId; // add currentUserId to terms
-//     const {selector, options} = Posts.getParameters(terms);
-// 
-//     Counts.publish(this, terms.listId, Posts.find(selector, options), {noReady: true});
-// 
-//     options.fields = Posts.publishedFields.list;
-// 
-//     const posts = Posts.find(selector, options);
-// 
-//     // note: doesn't work yet :(
-//     // CursorCounts.set(terms, posts.count(), this.connection.id);
-// 
-//     const users = Tracker.nonreactive(function () {
-//       return getPostsListUsers(posts);
-//     });
-// 
-//     return Users.canDo(currentUser, "posts.view.approved.all") ? [posts, users] : [];
-// 
-//   });
-// 
-// });
-// 
-// /**
-//  * @summary Publish a single post, along with all relevant users
-//  * @param {Object} terms
-//  */
-// Meteor.publish('posts.single', function (terms) {
-// 
-//   check(terms, Match.OneOf({_id: String}, {_id: String, slug: Match.Any}));
-// 
-//   const currentUser = this.userId && Users.findOne(this.userId);
-//   const options = {fields: Posts.publishedFields.single};
-//   const posts = Posts.find(terms._id, options);
-//   const post = posts.fetch()[0];
-// 
-//   if (post) {
-//     const users = getSinglePostUsers(post);
-//     return Users.canView(currentUser, post) ? [posts, users] : [];
-//   } else {
-//     console.log(`// posts.single: no post found for _id “${terms._id}”`); // eslint-disable-line
-//     return [];
-//   }
-// 
-// });
diff --git a/packages/nova-search/lib/parameters.js b/packages/nova-search/lib/parameters.js
index c863aa01b..3e2527b4e 100644
--- a/packages/nova-search/lib/parameters.js
+++ b/packages/nova-search/lib/parameters.js
@@ -1,5 +1,5 @@
 import escapeStringRegexp from 'escape-string-regexp';
-import { Callbacks, addCallback, Utils } from 'meteor/nova:core';
+import { addCallback, Utils } from 'meteor/nova:core';
 
 function addSearchQueryParameter (parameters, terms) {
   if(!!terms.query) {
@@ -21,4 +21,4 @@ function addSearchQueryParameter (parameters, terms) {
   }
   return parameters;
 }
-addCallback("posts.parameters", addSearchQueryParameter);
\ No newline at end of file
+addCallback("posts.parameters", addSearchQueryParameter);
diff --git a/packages/nova-subscribe/lib/callbacks.js b/packages/nova-subscribe/lib/callbacks.js
index 2fc92dd4a..b399c64ce 100644
--- a/packages/nova-subscribe/lib/callbacks.js
+++ b/packages/nova-subscribe/lib/callbacks.js
@@ -1,6 +1,6 @@
 import Telescope from 'meteor/nova:lib';
 import Users from 'meteor/nova:users';
-import { Callbacks, addCallback } from 'meteor/nova:core';
+import { addCallback } from 'meteor/nova:core';
 
 // note: even if all these callbacks are async, they are imported on the client so they pop in the cheatsheet when debug is enabled
 
diff --git a/packages/nova-subscribe/lib/components/PostsSubscribedList.jsx b/packages/nova-subscribe/lib/components/PostsSubscribedList.jsx
deleted file mode 100644
index 2a32c6c3f..000000000
--- a/packages/nova-subscribe/lib/components/PostsSubscribedList.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-// import Telescope from 'meteor/nova:lib';
-// import React, { PropTypes, Component } from 'react';
-// import { ListContainer } from "meteor/utilities:react-list-container";
-// import Posts from "meteor/nova:posts";
-
-// class PostsSubscribedList extends Component {
-
-//   render() {
-
-//     const params = {view: 'userSubscribedPosts', userId: Meteor.userId(), listId: "posts.list.subscribed"};
-//     const {selector, options} = Posts.getParameters(params);
-
-//     return (
-//       <ListContainer
-//         collection={Posts}
-//         publication="posts.list"
-//         selector={selector}
-//         options={options}
-//         terms={params}
-//         joins={Posts.getJoins()}
-//         component={Telescope.components.PostsList}
-//         cacheSubscription={false}
-//         listId={params.listId}
-//         limit={Telescope.settings.get("postsPerPage", 10)}
-//       />
-//     )
-//   }
-// };
-
-// module.exports = PostsSubscribedList;
diff --git a/packages/nova-users/lib/collection.js b/packages/nova-users/lib/collection.js
index ebdd6f7aa..cefca3d17 100644
--- a/packages/nova-users/lib/collection.js
+++ b/packages/nova-users/lib/collection.js
@@ -25,4 +25,4 @@ const Users = createCollection({
 
 GraphQLSchema.addQuery(`currentUser: User`);
 
-export default Users;
\ No newline at end of file
+export default Users;
diff --git a/packages/nova-voting/lib/resolvers.js b/packages/nova-voting/lib/resolvers.js
index 8a6b1b27f..7bfc79009 100644
--- a/packages/nova-voting/lib/resolvers.js
+++ b/packages/nova-voting/lib/resolvers.js
@@ -1,4 +1,4 @@
-import { GraphQLSchema } from 'meteor/nova:lib';
+import { GraphQLSchema } from 'meteor/nova:core';
 
 const specificResolvers = {
   Post: {