diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb
index 2c9c767..b568dc7 100644
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -88,7 +88,7 @@ module BoxesHelper
   end
 
   def render_block block, prefix = nil, klass = block.class
-    template_name = klass.name.underscore.sub '_block', ''
+    template_name = klass.name.demodulize.underscore.sub '_block', ''
     begin
       render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
     rescue ActionView::MissingTemplate
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 5541e16..067a874 100644
--- a/plugins/container_block/lib/container_block_plugin/container_block.rb
+++ b/plugins/container_block/lib/container_block_plugin/container_block.rb
@@ -66,13 +66,6 @@ class ContainerBlockPlugin::ContainerBlock < Block
     children_settings[child_id][:width] if children_settings[child_id]
   end
 
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/container', :locals => {:block => block}
-    end
-  end
-
   def copy_from_with_container(block)
     copy_from_without_container(block)
     children_settings = block.children_settings
--
libgit2 0.21.2