[drupal8] Cleanups