diff --git a/plugins/container_block/lib/container_block_plugin/container_block.rb b/plugins/container_block/lib/container_block_plugin/container_block.rb
index a505a20..87b4007 100644
--- a/plugins/container_block/lib/container_block_plugin/container_block.rb
+++ b/plugins/container_block/lib/container_block_plugin/container_block.rb
@@ -24,7 +24,7 @@ class ContainerBlockPlugin::ContainerBlock < Block
   end
 
   def create_box
-    box = Box.create!(:owner => self)
+    box = Box.create!(:owner => owner)
     settings[:container_box_id] = box.id
     save!
   end
@@ -34,7 +34,7 @@ class ContainerBlockPlugin::ContainerBlock < Block
   end
 
   def container_box
-    Box.find(container_box_id)
+    owner.boxes.find(container_box_id)
   end
 
   def block_classes=(classes)
diff --git a/plugins/container_block/lib/container_block_plugin/container_block_array.rb b/plugins/container_block/lib/container_block_plugin/container_block_array.rb
deleted file mode 100644
index 8dc36b2..0000000
--- a/plugins/container_block/lib/container_block_plugin/container_block_array.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module ContainerBlockPlugin::ContainerBlockArray
-
-  def blocks_with_container_block_plugin(reload = false)
-    blocks = blocks_without_container_block_plugin(reload)
-    blocks.each { |block| blocks.concat(block.blocks) if block.kind_of?(ContainerBlockPlugin::ContainerBlock) }
-  end
-
-  def self.included(base)
-    base.class_eval do
-      alias_method_chain :blocks, :container_block_plugin
-    end
-  end
-
-end
diff --git a/plugins/container_block/lib/ext/block.rb b/plugins/container_block/lib/ext/block.rb
deleted file mode 100644
index 6aad9b3..0000000
--- a/plugins/container_block/lib/ext/block.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_dependency 'block'
-
-class Block
-  def owner_with_container_block_plugin
-    owner = owner_without_container_block_plugin
-    owner.kind_of?(ContainerBlockPlugin::ContainerBlock) ? owner.owner : owner
-  end
-
-  alias_method_chain :owner, :container_block_plugin
-end
diff --git a/plugins/container_block/lib/ext/environment.rb b/plugins/container_block/lib/ext/environment.rb
deleted file mode 100644
index e48c88f..0000000
--- a/plugins/container_block/lib/ext/environment.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_dependency 'environment'
-
-class Environment
-  include ContainerBlockPlugin::ContainerBlockArray
-end
diff --git a/plugins/container_block/lib/ext/profile.rb b/plugins/container_block/lib/ext/profile.rb
deleted file mode 100644
index ac6f696..0000000
--- a/plugins/container_block/lib/ext/profile.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_dependency 'profile'
-
-class Profile
-  include ContainerBlockPlugin::ContainerBlockArray
-end
diff --git a/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb b/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb
deleted file mode 100644
index 276f19f..0000000
--- a/plugins/container_block/test/unit/container_block_plugin/container_block_array_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'test_helper'
-
-class ContainerBlockPlugin::ContainerBlockArrayTest < ActiveSupport::TestCase
-
-  attr_reader :blocks
-
-  include ContainerBlockPlugin::ContainerBlockArray
-
-  def setup
-    @blocks = []
-
-    @environment = fast_create(Environment)
-    @container_box = Box.new(:owner => @environment)
-    @container = ContainerBlockPlugin::ContainerBlock.new(:box => @container_box)
-  end
-
-  should 'return blocks as usual' do
-    @blocks << Block.new
-    assert_equal @blocks, blocks_without_container_block_plugin
-  end
-
-  should 'return blocks and container block children' do
-    @container.save!
-    @container_box.blocks << Block.new
-    @blocks.concat([Block.new, @container])
-    assert_equal @blocks + @container.blocks, blocks_without_container_block_plugin
-  end
-
-end
diff --git a/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb b/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
index 2baca7d..62e1fa3 100644
--- a/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
+++ b/plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
@@ -4,6 +4,7 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
 
   def setup
     @block = ContainerBlockPlugin::ContainerBlock.new
+    @block.stubs(:owner).returns(Environment.default)
   end
 
   should 'describe yourself' do
--
libgit2 0.21.2