diff --git a/lib/active_admin/application.rb b/lib/active_admin/application.rb
index <HASH>..<HASH> 100644
--- a/lib/active_admin/application.rb
+++ b/lib/active_admin/application.rb
@@ -131,7 +131,6 @@ module ActiveAdmin
     # to allow for changes without having to restart the server.
     def unload!
       namespaces.values.each{|namespace| namespace.unload! }
-      #self.namespaces = {}
       @@loaded = false
     end
 
diff --git a/lib/active_admin/comments.rb b/lib/active_admin/comments.rb
index <HASH>..<HASH> 100644
--- a/lib/active_admin/comments.rb
+++ b/lib/active_admin/comments.rb
@@ -18,9 +18,8 @@ ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Generate a Comment resource when namespaces are registered
-ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent,
-                             ActiveAdmin::Namespace::RegisterEvent do |_|
-  ActiveAdmin.application.namespaces.values.each do |namespace|
+ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent do |app|
+  app.namespaces.values.each do |namespace|
     if namespace.comments?
       namespace.register ActiveAdmin::Comment, :as => 'Comment' do
         actions :index, :show, :create
Reload the comments when the application reloads