Making more generic by removing references to Drupal 8.