diff --git a/IPython/nbconvert/templates/html/basic.tpl b/IPython/nbconvert/templates/html/basic.tpl
index 4a9cc37..1ab8fe2 100644
--- a/IPython/nbconvert/templates/html/basic.tpl
+++ b/IPython/nbconvert/templates/html/basic.tpl
@@ -13,26 +13,6 @@
 </div>
 {% endblock input_group %}
 
-{% block m_input_group -%}
-<div class="input">
-{{ super() }}
-</div>
-{% endblock m_input_group %}
-
-{% block h_input_group -%}
-<div class="input">
-{{ super() }}
-</div>
-{% endblock h_input_group %}
-
-{% block r_input_group -%}
-{{ super() }}
-{% endblock r_input_group %}
-
-{% block u_input_group -%}
-{{ super() }}
-{% endblock u_input_group %}
-
 {% block output_group %}
 <div class="output_wrapper">
 <div class="output">
@@ -78,31 +58,37 @@ In&nbsp;[{{ cell.prompt_number }}]:
 </div>
 {% endblock output %}
 
-{% block m_input %}
+{% block markdowncell scoped %}
+<div class="input">
+{{ self.e_in_prompt() }}
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source  | markdown2html | strip_files_prefix }}
 </div>
 </div>
-{%- endblock m_input %}
+</div>
+{%- endblock markdowncell %}
 
-{% block h_input %}
+{% block headingcell scoped %}
+<div class="input">
+{{ self.e_in_prompt() }}
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ ("#" * cell.level + cell.source) | replace('\n', ' ')  | markdown2html | strip_files_prefix | add_anchor }}
 </div>
 </div>
-{% endblock h_input %}
+</div>
+{% endblock headingcell %}
 
-{% block r_input %}
+{%- block rawcell scoped -%}
 {% if cell.metadata.get('raw_mimetype', resources.get('raw_mimetype', '')).lower() in resources.get('raw_mimetypes', ['']) %}
     {{ cell.source }}
 {% endif %}
-{% endblock r_input %}
+{%- endblock rawcell -%}
 
-{% block u_input %}
+{% block unknowncell scoped %}
 unknown type  {{ cell.type }}
-{% endblock u_input %}
+{% endblock unknowncell %}
 
 {% block pyout -%}
 <div class="box-flex1 output_subarea output_pyout">
diff --git a/IPython/nbconvert/templates/skeleton/null.tpl b/IPython/nbconvert/templates/skeleton/null.tpl
index f3af824..9779043 100644
--- a/IPython/nbconvert/templates/skeleton/null.tpl
+++ b/IPython/nbconvert/templates/skeleton/null.tpl
@@ -71,17 +71,9 @@ consider calling super even if it is a leave block, we might insert more blocks 
                 {%- endblock codecell -%}
             {%- elif cell.cell_type in ['markdown'] -%}
                 {%- block markdowncell scoped-%}
-                    {%- block m_input_group -%}
-                        {%- block e_in_prompt -%}{%- endblock e_in_prompt -%}
-                        {%- block m_input -%}{%- endblock m_input -%}
-                    {%- endblock m_input_group -%}
                 {%- endblock markdowncell -%}
             {%- elif cell.cell_type in ['heading'] -%}
                 {%- block headingcell scoped-%}
-                    {%- block h_input_group -%}
-                        {{ self.e_in_prompt() }}
-                        {%- block h_input -%}{%- endblock h_input -%}
-                    {%- endblock h_input_group -%}
                 {%- endblock headingcell -%}
             {%- elif cell.cell_type in ['raw'] -%}
                 {%- block rawcell scoped -%}
@@ -91,10 +83,6 @@ consider calling super even if it is a leave block, we might insert more blocks 
                 {%- endblock rawcell -%}
             {%- else -%}
                 {%- block unknowncell scoped-%}
-                    {%- block u_input_group -%}
-                        {{ self.e_in_prompt() }}
-                        {%- block u_input -%}{%- endblock u_input -%}
-                    {%- endblock u_input_group -%}
                 {%- endblock unknowncell -%}
             {%- endif -%}
         {%- endblock any_cell -%}