diff --git a/mod_pubsub_ng/exmpp_pubsub.erl b/mod_pubsub_ng/exmpp_pubsub.erl
index 9486cbd8d..f7d4d2ad6 100644
--- a/mod_pubsub_ng/exmpp_pubsub.erl
+++ b/mod_pubsub_ng/exmpp_pubsub.erl
@@ -273,15 +273,15 @@
       Subscription_Options :: []}
 ).
 
--type(subscription()
-  :: {Subscription_State   :: exmpp_pubsub:subscription_state(),
-      SubId                :: exmpp_pubsub:subId(),
-      Resource             :: undefined | xmpp_jid:resource_jid() | {'caps', xmpp_jid:resource_jid()},
-      Subscription_Options :: [] | pubsub_options:options_subscription()}
-%%  :: exmpp_pubsub:subscription_subscribed()
-%%   | exmpp_pubsub:subscription_pending()
-%%   | exmpp_pubsub:subscription_unconfigured()
-).
+%% -type(subscription()
+%%   :: {Subscription_State   :: exmpp_pubsub:subscription_state(),
+%%       SubId                :: exmpp_pubsub:subId(),
+%%       Resource             :: undefined | xmpp_jid:resource_jid() | {'caps', xmpp_jid:resource_jid()},
+%%       Subscription_Options :: [] | pubsub_options:options_subscription()}
+%% %%  :: exmpp_pubsub:subscription_subscribed()
+%% %%   | exmpp_pubsub:subscription_pending()
+%% %%   | exmpp_pubsub:subscription_unconfigured()
+%% ).
 
 -type(subscriptions()
     :: [exmpp_pubsub:subscription(),...]
diff --git a/mod_pubsub_ng/node_flat_dev.erl b/mod_pubsub_ng/node_flat_dev.erl
index f8cdcb5ea..27c02c109 100644
--- a/mod_pubsub_ng/node_flat_dev.erl
+++ b/mod_pubsub_ng/node_flat_dev.erl
@@ -29,7 +29,6 @@
 
 -include("pubsub_dev.hrl").
 -include("pubsub_api.hrl").
--include("logger.hrl").
 
 -compile(export_all).
 
diff --git a/mod_pubsub_ng/pubsub_db.erl b/mod_pubsub_ng/pubsub_db.erl
index 1a9ea53de..37e8e4473 100644
--- a/mod_pubsub_ng/pubsub_db.erl
+++ b/mod_pubsub_ng/pubsub_db.erl
@@ -31,7 +31,6 @@
 
 -include("pubsub_dev.hrl").
 -include("pubsub_api.hrl").
--include("logger.hrl").
 
 
 -import(pubsub_tools,
diff --git a/mod_pubsub_ng/pubsub_dev.hrl b/mod_pubsub_ng/pubsub_dev.hrl
index 9a695ca16..e2c873b1e 100644
--- a/mod_pubsub_ng/pubsub_dev.hrl
+++ b/mod_pubsub_ng/pubsub_dev.hrl
@@ -2,6 +2,7 @@
 
 %-include_lib("exmpp/include/exmpp.hrl").
 %-include_lib("exmpp/include/exmpp_jid.hrl").
+-include("logger.hrl").
 -include("ejabberd.hrl").
 -include("mod_roster.hrl").
 -include("jlib.hrl").
diff --git a/mod_pubsub_ng/pubsub_groups.erl b/mod_pubsub_ng/pubsub_groups.erl
index 79270637a..622094401 100644
--- a/mod_pubsub_ng/pubsub_groups.erl
+++ b/mod_pubsub_ng/pubsub_groups.erl
@@ -76,10 +76,10 @@
 
 -type(n0des() :: [Node::n0de(),...]).
 
--type(subscription()
-  :: {NodeIdx :: exmpp_pubsub:nodeIdx(),
-      Groups  :: roster_groups()}
-).
+%% -type(subscription()
+%%   :: {NodeIdx :: exmpp_pubsub:nodeIdx(),
+%%       Groups  :: roster_groups()}
+%% ).
 
 -type(subscriptions() :: [Subscription::subscription(),...]).