diff --git a/app/models/category.rb b/app/models/category.rb
index c379297..885a19f 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -22,14 +22,6 @@ class Category < ActiveRecord::Base
 
   named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
 
-  named_scope :sub_categories, lambda { |category|
-    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
-  }
-
-  named_scope :sub_tree, lambda { |category|
-    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
-  }
-
   acts_as_filesystem
 
   has_many :article_categorizations
diff --git a/test/unit/category_test.rb b/test/unit/category_test.rb
index 5eb2c0b..2b886fc 100644
--- a/test/unit/category_test.rb
+++ b/test/unit/category_test.rb
@@ -490,10 +490,13 @@ class CategoryTest < ActiveSupport::TestCase
   should 'paginate upcoming events' do
     category = Category.create!(:name => 'category1', :environment_id => Environment.default.id)
     profile = fast_create(Profile)
-    event1 = category.events.build(:name => 'event1', :start_date => Time.now, :profile => profile)	
-    event2 = category.events.build(:name => 'event2', :start_date => Time.now + 1.hour, :profile => profile)	
-    event3 = category.events.build(:name => 'event3', :start_date => Time.now + 1.day, :profile => profile)
-    category.save!
+    event1 = Event.create!(:name => 'event1', :profile => profile, :start_date => Time.now)
+    event2 = Event.create!(:name => 'event2', :profile => profile, :start_date => Time.now + 1.hour)
+    event3 = Event.create!(:name => 'event3', :profile => profile, :start_date => Time.now + 1.day)
+    ArticleCategorization.add_category_to_article(category, event1)
+    ArticleCategorization.add_category_to_article(category, event2)
+    ArticleCategorization.add_category_to_article(category, event3)
+
     assert_equal [event1, event2], category.upcoming_events(2)
   end
 
@@ -537,38 +540,4 @@ class CategoryTest < ActiveSupport::TestCase
     assert_includes Category.on_level(parent.id), category
   end
 
-  should 'list category sub-categories' do
-    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
-    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
-    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
-    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
-    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
-
-    sub_categories = Category.sub_categories(c1)
-
-    assert ActiveRecord::NamedScope::Scope, sub_categories.class
-    assert_not_includes sub_categories, c1
-    assert_not_includes sub_categories, c2
-    assert_includes sub_categories, c3
-    assert_includes sub_categories, c4
-    assert_includes sub_categories, c5
-  end
-
-  should 'list category sub-tree' do
-    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
-    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
-    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
-    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
-    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
-
-    sub_tree = Category.sub_tree(c1)
-
-    assert ActiveRecord::NamedScope::Scope, sub_tree.class
-    assert_includes sub_tree, c1
-    assert_not_includes sub_tree, c2
-    assert_includes sub_tree, c3
-    assert_includes sub_tree, c4
-    assert_includes sub_tree, c5
-  end
-
 end
--
libgit2 0.21.2