upgrade to Drupal 7 version of site
remove deprecated Drupal 6 code