diff -u b/core/modules/node/templates/node-edit-form.html.twig b/core/modules/node/templates/node-edit-form.html.twig
--- b/core/modules/node/templates/node-edit-form.html.twig
+++ b/core/modules/node/templates/node-edit-form.html.twig
@@ -20,11 +20,3 @@
 <div>
-  <div>
-    {{ form|without('advanced', 'actions') }}
-  </div>
-  <div>
-    {{ form.advanced }}
-  </div>
-  <div>
-    {{ form.actions }}
-  </div>
+  {{ form }}
 </div>
diff -u b/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
--- b/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -68,12 +68,7 @@
  * @ingroup themeable
  */
 #}
-{%
-  set classes = [
-    not node.isPublished() ? 'node--unpublished',
-  ]
-%}
-<article{{ attributes.addClass(classes) }}>
+<article{{ attributes }}>
 
   {{ title_prefix }}
   {% if not page %}
@@ -96,11 +91,5 @@
   <div{{ content_attributes }}>
-    {{ content|without('links') }}
+    {{ content }}
   </div>
 
-  {% if content.links %}
-    <div>
-      {{ content.links }}
-    </div>
-  {% endif %}
-
 </article>
reverted:
--- b/core/themes/classy/templates/node-add-list.html.twig
+++ /dev/null
@@ -1,32 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to list node types available for adding content.
- *
- * This list is displayed on the Add content admin page.
- *
- * Available variables:
- * - types: A list of content types, each with the following properties:
- *   - add_link: Link to create a piece of content of this type.
- *   - description: Description of this type of content.
- *
- * @see template_preprocess_node_add_list()
- *
- * @ingroup themeable
- */
-#}
-{% if types is not empty %}
-  <dl class="node-type-list">
-    {% for type in types %}
-      <dt>{{ type.add_link }}</dt>
-      <dd>{{ type.description }}</dd>
-    {% endfor %}
-  </dl>
-{% else %}
-  <p>
-    {% set create_content = path('node.type_add') %}
-    {% trans %}
-      You have not created any content types yet. Go to the <a href="{{ create_content }}">content type creation page</a> to add a new content type.
-    {% endtrans %}
-  </p>
-{% endif %}
reverted:
--- b/core/themes/classy/templates/node-edit-form.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a node edit form.
- *
- * Two column template for the node add/edit form.
- *
- * This template will be used when a node edit form specifies 'node_edit_form'
- * as its #theme callback.  Otherwise, by default, node add/edit forms will be
- * themed by theme_form().
- *
- * Available variables:
- * - form: The node add/edit form.
- *
- * @see seven_form_node_form_alter()
- *
- * @ingroup themeable
- */
-#}
-<div class="layout-node-form clearfix">
-  <div class="layout-region layout-region-node-main">
-    {{ form|without('advanced', 'actions') }}
-  </div>
-  <div class="layout-region layout-region-node-secondary">
-    {{ form.advanced }}
-  </div>
-  <div class="layout-region layout-region-node-footer">
-    {{ form.actions }}
-  </div>
-</div>
reverted:
--- b/core/themes/classy/templates/node.html.twig
+++ /dev/null
@@ -1,106 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a node.
- *
- * Available variables:
- * - node: Full node entity.
- *   - id: The node ID.
- *   - bundle: The type of the node, for example, "page" or "article".
- *   - authorid: The user ID of the node author.
- *   - createdtime: Formatted creation date. Preprocess functions can
- *     reformat it by calling format_date() with the desired parameters on
- *     $variables['node']->getCreatedTime().
- * - label: The title of the node.
- * - content: All node items. Use {{ content }} to print them all,
- *   or print a subset such as {{ content.field_example }}. Use
- *   {{ content|without('field_example') }} to temporarily suppress the printing
- *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
- * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
- * - url: Direct URL of the current node.
- * - display_submitted: Whether submission information should be displayed.
- * - attributes: HTML attributes for the containing element.
- *   The attributes.class element may contain one or more of the following
- *   classes:
- *   - node: The current template type (also known as a "theming hook").
- *   - node--type-[type]: The current node type. For example, if the node is an
- *     "Article" it would result in "node--type-article". Note that the machine
- *     name will often be in a short form of the human readable label.
- *   - node--view-mode-[view_mode]: The View Mode of the node; for example, a
- *     teaser would result in: "node--view-mode-teaser", and
- *     full: "node--view-mode-full".
- *   The following are controlled through the node publishing options.
- *   - node--promoted: Appears on nodes promoted to the front page.
- *   - node--sticky: Appears on nodes ordered above other non-sticky nodes in
- *     teaser listings.
- *   - node--unpublished: Appears on unpublished nodes visible only to site
- *     admins.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- * - view_mode: View mode; for example, "teaser" or "full".
- * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
- * - page: Flag for the full page state. Will be true if view_mode is 'full'.
- * - readmore: Flag for more state. Will be true if the teaser content of the
- *   node cannot hold the main body content.
- * - is_front: Flag for front. Will be true when presented on the front page.
- * - logged_in: Flag for authenticated user status. Will be true when the
- *   current user is a logged-in member.
- * - is_admin: Flag for admin user status. Will be true when the current user
- *   is an administrator.
- *
- * @see template_preprocess_node()
- *
- * @todo Remove the id attribute (or make it a class), because if that gets
- *   rendered twice on a page this is invalid CSS for example: two lists
- *   in different view modes.
- *
- * @ingroup themeable
- */
-#}
-{%
-  set classes = [
-    'node',
-    'node--type-' ~ node.bundle|clean_class,
-    node.isPromoted() ? 'node--promoted',
-    node.isSticky() ? 'node--sticky',
-    not node.isPublished() ? 'node--unpublished',
-    view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
-  ]
-%}
-<article{{ attributes.addClass(classes) }}>
-
-  {{ title_prefix }}
-  {% if not page %}
-    <h2{{ title_attributes }}>
-      <a href="{{ url }}" rel="bookmark">{{ label }}</a>
-    </h2>
-  {% endif %}
-  {{ title_suffix }}
-
-  {% if display_submitted %}
-    <footer class="node__meta">
-      {{ author_picture }}
-      <div{{ author_attributes.addClass('node__submitted') }}>
-        {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
-
-  <div{{ content_attributes.addClass('node__content') }}>
-    {{ content|without('links') }}
-  </div>
-
-  {% if content.links %}
-    <div class="node__links">
-      {{ content.links }}
-    </div>
-  {% endif %}
-
-</article>