Updated Module, latest code, removed legacy Drupal 7 logic.