diff --git a/TODO b/TODO
index 1e1b7f263..e43cbfda2 100644
--- a/TODO
+++ b/TODO
@@ -2,20 +2,22 @@
 v0.9.0-alpha (2015-05-30)
 -------------------------
 
+Presence Management....
+
+Dashboard
+
+Presence Management....
+
 
 v0.8.0-alpha (2015-05-10)
 -------------------------
 
-Presence Management....
-
 Force Subscriptions...
 
 Documents...
 
 MySQL Auth
 
-Dashboard
-
 AMQP
 
 Bridge Test
@@ -24,8 +26,6 @@ Bridge Test
 0.8.0 (2015-05-10)
 -------------------------
 
-Presence Management....
-
 Force Subscription...
 
 Point2Point Queue...
diff --git a/rel/files/emqttd.config b/rel/files/emqttd.config
index 716cd3421..6a723470c 100644
--- a/rel/files/emqttd.config
+++ b/rel/files/emqttd.config
@@ -109,9 +109,9 @@
     %% Modules
     {modules, [
         %% Subscribe topics automatically when client connected
-        {autosub, [{"$Q/client/$c", 0}]},
+        {autosub, [{"$Q/client/$c", 0}]}
         %% Rewrite rules
-        {rewrite, [{file, "etc/rewrite.config"}]}
+        %% {rewrite, [{file, "etc/rewrite.config"}]}
         
     ]},
     %% Listeners