Changed drupal version.  Removed some extras.