Cleanup of upgrade of DROPS to Drupal 8. Ready for testing