Clean up and Updated Drupal to 7.18.