Remove drupal references, management classes should be drupal independent