diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc
index d5a796d..3eedd8f 100644
--- a/core/modules/field/field.deprecated.inc
+++ b/core/modules/field/field.deprecated.inc
@@ -176,78 +176,6 @@ function field_info_instance($entity_type, $field_name, $bundle_name) {
 }
 
 /**
- * Adds form elements for all fields for an entity to a form structure.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *   The entity for which to load form elements, used to initialize
- *   default form values.
- * @param $form
- *   The form structure to fill in. This can be a full form structure, or a
- *   sub-element of a larger form. The #parents property can be set to control
- *   the location of submitted field values within $form_state['values']. If
- *   not specified, $form['#parents'] is set to an empty array, placing field
- *   values at the top-level of $form_state['values'].
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param $langcode
- *   The language the field values are going to be entered, if no language
- *   is provided the default site language will be used.
- * @param array $options
- *   An associative array of additional options. See field_invoke_method() for
- *   details.
- *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
- *
- * @see field_form_get_state()
- * @see field_form_set_state()
- */
-function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langcode = NULL, array $options = array()) {
-  \Drupal::service('entity.content.form_helper')->attachWidgets($entity, $form_state['form_display'], $form, $form_state);
-}
-
-/**
- * Performs field validation against form-submitted field values.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- *   The entity being submitted. The actual field values will be read
- *   from $form_state['values'].
- * @param $form
- *   The form structure where field elements are attached to. This might be a
- *   full form structure, or a sub-element of a larger form.
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param array $options
- *   An associative array of additional options. See field_invoke_method() for
- *   details.
- *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
- */
-function field_attach_form_validate(ContentEntityInterface $entity, $form, &$form_state, array $options = array()) {
-  \Drupal::service('entity.content.form_helper')->validateWidgetsValues($entity, $form_state['form_display'], $form, $form_state);
-}
-
-/**
- * Populates an entity object with values from a form submission.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *   The entity being submitted. The actual field values will be read
- *   from $form_state['values'].
- * @param $form
- *   The form structure where field elements are attached to. This might be a
- *   full form structure, or a sub-element of a larger form.
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param array $options
- *   An associative array of additional options. See field_invoke_method() for
- *   details.
- *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
- */
-function field_attach_extract_form_values(EntityInterface $entity, $form, &$form_state, array $options = array()) {
-  \Drupal::service('entity.content.form_helper')->extractWidgetsValues($entity, $form_state['form_display'], $form, $form_state);
-}
-
-/**
  * Prepares field data prior to display.
  *
  * This function lets field types and formatters load additional data needed for