drop drupal 6 dictionary, add drupal 7; cleanup