remove more Drupal-related bits