Update to remove the Drupal left Over code