Removed unnecessary code.  Drupal best practices ...