diff --git a/css/fivestar-admin-rtl.css b/css/fivestar-admin-rtl.css
index 61698cf..10087eb 100644
--- a/css/fivestar-admin-rtl.css
+++ b/css/fivestar-admin-rtl.css
@@ -2,15 +2,6 @@ div.fivestar-widgets div.form-item {
   float: right;
 }
 
-#fivestar-direct-form {
-  float: right;
-}
-#fivestar-direct-preview {
-  float: right;
-  margin-right: 40px;
-  margin-left: 0px;
-}
-
 #placeholder {
   left: 0;
   right: auto;
diff --git a/css/fivestar-admin.css b/css/fivestar-admin.css
index efd6538..210eefd 100644
--- a/css/fivestar-admin.css
+++ b/css/fivestar-admin.css
@@ -8,23 +8,6 @@ div.fivestar-widgets div.form-item {
   float: left; /* RTL */
 }
 
-/* Fivestar Node Type Preview */
-#fivestar-direct-form {
-  float: left; /* RTL */
-}
-#fivestar-direct-preview {
-  float: left; /* RTL */
-  margin-left: 40px; /* RTL */
-  width: 300px;
-}
-#fivestar-node-type-form fieldset {
-  background: transparent;
-}
-.fivestar-preview {
-  border: 1px solid #CCC;
-  padding: 10px;
-}
-
 /* Farbtastic placement */
 .color-form {
   max-width: 50em;
@@ -75,10 +58,3 @@ div.fivestar-widgets div.form-item {
 #fivestar-palette .item-selected input {
   border: 2px solid black;
 }
-#fivestar-direct-preview div.description {
-  margin-bottom: 0;
-}
-#fivestar-direct-preview div.feedback{
-  font-size: 0.85em;
-  line-height: 150%;
-}
diff --git a/fivestar.install b/fivestar.install
index 1484312..06ac45b 100644
--- a/fivestar.install
+++ b/fivestar.install
@@ -251,3 +251,115 @@ function fivestar_update_7202() {
     }
   }
 }
+
+  
+/**
+ * Convert all existing fivestar/node_type settings into fields with exposed fivestar formatters
+ */
+function fivestar_update_7203() {
+  // Gather the node types
+  $query = db_select('node_type', 'n');
+  $query->addField('n', 'type');
+  $result = $query->execute();
+  $types = $result->fetchCol();
+
+  // Gather the tags.  In the case that fivestar_get_tags() is ever removed from
+  // the module, this update still needs to run.
+  $tags_txt = variable_get('fivestar_tags', 'vote');
+  $tags_exploded = explode(',', $tags_txt);
+
+  $tags = array();
+  $got_vote = false;
+  foreach ($tags_exploded as $tag) {
+    $tag_trimmed = trim($tag);
+    if ($tag_trimmed) {
+      $tags[] = $tag_trimmed;
+      if ($tag_trimmed == 'vote') {
+        $got_vote = true;
+      }
+    }
+  }
+
+  if (!$got_vote) {
+    $tags[] = 'vote';
+  }
+  $tags;
+
+  foreach($tags as $tag) {
+    $suffix = '';
+    foreach($types as $type) {
+      $var_suffix = $type . ($tag == 'vote' ? '' : '_' . $tag);
+
+      $settings = array(
+        'stars' => variable_get('fivestar_stars_' . $var_suffix, 6),
+        'allow_clear' => variable_get('fivestar_unvote_' . $var_suffix, 0),
+        'feedback_enable' => variable_get('fivestar_feedback_'. $var_suffix, 1),
+        'style' => variable_get('fivestar_style_' . $var_suffix, 'average'),
+        'text' => variable_get('fivestar_text_' . $var_suffix, 'dual'),
+      );
+
+      if (variable_get('fivestar_' . $var_suffix, FALSE)) {
+        // Check to see if a field for this tag exists and create one if needed
+        $field_name = 'field_' . $tag;
+        $field = field_read_field($field_name . $suffix, array('include_deleted' => TRUE));
+
+        $i = 0;
+        while(!empty($field) && $field['type'] != 'fivestar') {
+          $suffix = '_' . $i;
+          $field = field_read_field($field_name . $suffix, array('include_deleted' => TRUE));
+          $i++;
+        }
+        if (empty($field)) {
+          $field_values = array(
+            'field_name' => $field_name . $suffix,
+            'type' => 'fivestar',
+            'settings' => array(
+              'axis' => $tag,
+            ),
+          );
+          $field = field_create_field($field_values);
+        }
+        
+        // Create an instance of the field in this bundle
+        $instance = field_read_instance('node', $field['field_name'], $type, array('include_deleted' => TRUE));
+        if (empty($instance)) {
+          $settings['allow_clear'] = $settings['unvote_enable'];
+          $settings['style'] = $settings['star_display'];
+          $settings['text'] = $settings['text_display'];
+
+          $instance_info = array(
+            'field_name' => $field['field_name'],
+            'entity_type' => 'node',
+            'bundle' => $type,
+            'widget' => array(
+              'type' => 'stars',
+            ),
+            'display' => array(
+              'default' => array(
+                'type' => 'fivestar_formatter_exposed_stars',
+                'settings' => $settings,
+              ),
+            ),
+            'settings' => array(
+              'stars' => $settings['stars'],
+              'target' => 'self',
+            ),
+          );
+
+          if (variable_get('fivestar_position_teaser_' . $var_suffix, 'hidden') != 'hidden') {
+            $instance_info['display']['teaser'] = array(
+              'type' => 'fivestar_formatter_exposed_stars',
+              'settings' => $settings,
+            );
+          }
+          
+          field_create_instance($instance_info);
+        }
+      }
+    }
+  }
+  
+  // Rebuild the menu to remove the node type tag form paths
+  menu_rebuild();
+  _field_info_collate_fields(TRUE);
+}
diff --git a/fivestar.module b/fivestar.module
index 1e6e308..0634620 100644
--- a/fivestar.module
+++ b/fivestar.module
@@ -14,19 +14,8 @@ function fivestar_help($path, $arg) {
   $output = '';
   switch ($path) {
     case 'admin/config/content/fivestar':
-      $output = t('This page is used to configure site-wide features of the Fivestar module. To setup Fivestar to rate content:');
-      $steps = array(
-        t('Configure site-wide settings for Fivestar below.'),
-        t('Go to <a href="!types">admin/structure/types</a> and edit the type you would like to rate.', array('!types' => url('admin/structure/types'))),
-        t('On the settings page for the content type, a set of options is available for fivestar, where you can enable rating for that type and set rating options.'),
-      );
-      $output .= theme('item_list', array('items' => $steps, 'type' => 'ol'));
-      break;
-    case 'admin/content/node-type/'. $arg[3] .'/fivestar':
-      $arg[5] = 'vote';
-    case 'admin/content/node-type/'. $arg[3] .'/fivestar/'. $arg[5]:
-      $output = t('Use the settings on this page to set up Fivestar rating for the %type content type. These settings specifically affect the %axis rating axis. If needing to set up different criteria for voting, see the main <a href="@url">Fivestar settings page</a>.', array('%type' => node_get_types('name', $arg[3]), '%axis' => $arg[5], '@url' => url('admin/config/content/fivestar')));
-      break;
+      $output = t('This page is used to configure site-wide features of the Fivestar module.');
+    break;
   }
   return $output;
 }
@@ -46,13 +35,6 @@ function fivestar_menu() {
     'type'              => MENU_NORMAL_ITEM,
     'file'              => 'includes/fivestar.admin.inc',
   );
-  $items['fivestar/preview/node'] = array(
-    'page callback'     => 'fivestar_preview',
-    'access callback'   => 'user_access',
-    'access arguments'  => array('administer content types'),
-    'type'              => MENU_CALLBACK,
-    'file'              => 'includes/fivestar.admin.inc',
-  );
   $items['fivestar/preview/color'] = array(
     'page callback'     => 'fivestar_preview_color',
     'access callback'   => 'user_access',
@@ -67,28 +49,6 @@ function fivestar_menu() {
     'type'              => MENU_CALLBACK,
   );
 
-  // Add a "fivestar" tab to each content type.
-  $items['admin/structure/types/manage/%node_type/fivestar'] = array(
-    'title' => 'Fivestar voting',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('fivestar_node_type_tag_form', 4),
-    'access arguments' => array('administer content types'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 5,
-    'file' => 'includes/fivestar.admin.inc',
-  );
-  foreach (fivestar_get_tags() as $tag) {
-    $items['admin/structure/types/manage/%node_type/fivestar/' . urlencode($tag)] = array(
-      'title' => $tag,
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('fivestar_node_type_tag_form', 4, $tag),
-      'access arguments' => array('administer content types'),
-      'type' => $tag == 'vote' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
-      'weight' => $tag == 'vote' ? 0 : 1,
-      'file' => 'includes/fivestar.admin.inc',
-    );
-  }
-
   return $items;
 }
 
@@ -165,10 +125,6 @@ function fivestar_theme() {
       'render element' => 'form',
       'file' => 'includes/fivestar.theme.inc',
     ),
-    'fivestar_node_type_tag_form' => array(
-      'render element' => 'form',
-      'file' => 'includes/fivestar.theme.inc',
-    ),
     'fivestar_color_form' => array(
       'render element' => 'form',
       'file' => 'includes/fivestar.theme.inc',
@@ -188,41 +144,6 @@ function fivestar_theme() {
   );
 }
 
-/**
- * Implementation of hook_node_type_delete().
- */
-function fivestar_node_type_delete($info) {
-  $type = $info->type;
-
-  // Be responsible and cleanup unneeded variables.
-  foreach (_fivestar_variables() as $variable) {
-    foreach (fivestar_get_tags() as $tag) {
-      $suffix = fivestar_get_suffix($type, $tag);
-      variable_del($variable . '_' . $suffix);
-    }
-  }
-}
-
-/**
- * Implementation of hook_node_type_update().
- */
-function fivestar_node_type_update($info) {
-  // When changing the type name, update the variables.
-  if (!empty($info->old_type) && $info->old_type != $info->type) {
-    foreach (_fivestar_variables() as $variable) {
-      foreach (fivestar_get_tags() as $tag) {
-        $oldvarname = $variable . '_' . fivestar_get_suffix($info->old_type, $tag);
-        $newvarname = $variable . '_' . fivestar_get_suffix($info->type, $tag);
-        $value = variable_get($oldvarname, -1);
-        if ($value != -1) {
-          variable_del($oldvarname);
-          variable_set($newvarname, $value);
-        }
-      }
-    }
-  }
-}
-
 function _fivestar_variables() {
   return array('fivestar', 'fivestar_unvote', 'fivestar_style', 'fivestar_stars', 'fivestar_comment', 'fivestar_position', 'fivestar_position_teaser', 'fivestar_labels_enable', 'fivestar_labels', 'fivestar_text', 'fivestar_title', 'fivestar_feedback');
 }
@@ -256,14 +177,6 @@ function fivestar_vote($entity_type, $id, $tag, $value) {
   }
   $result = _fivestar_cast_vote($entity_type, $id, $value, $tag, NULL, TRUE);
   drupal_alter('fivestar_vote_result', $result);
-  if ($entity_type == 'node') {
-    $node = node_load($id);
-  }
-
-  $suffix = fivestar_get_suffix((!isset($node) ? 'default' : $node->type), $tag);
-
-  $stars = variable_get('fivestar_stars_' . $suffix, 5);
-  $feedback_enable = variable_get('fivestar_feedback_' . $suffix, 1);
 
   $output .= '<xml><result>';
   if (count($result)) {
@@ -517,108 +430,6 @@ function fivestar_fivestar_widgets() {
 }
 
 /**
- * Implementation of hook_entity_view().
- *
- * Adds the fivestar widget to the entity.
- */
-function fivestar_entity_view($entity, $type, $view_mode, $langcode) {
-  $exclude_modes = array(
-    'preview',
-    'search_index',
-    'search_result',
-    'rss',
-  );
-  if ($type == 'node') {
-    if (!in_array($view_mode, $exclude_modes) && !isset($entity->modr8_form_teaser) && variable_get('fivestar_'. $entity->type, 0)) {
-      if ($view_mode == 'teaser') {
-        $position = variable_get('fivestar_position_teaser_'. $entity->type, 'above');
-      }
-      else {
-        $position = variable_get('fivestar_position_'. $entity->type, 'above');
-      }
-
-      switch ($position) {
-        case 'above':
-        case 'below':
-          if (user_access('rate content')) {
-            $content = '';
-            foreach (fivestar_get_tags() as $tag) {
-              if (fivestar_validate_target('node', $entity->nid, $tag)) {
-                $entity->content['fivestar_widget_' . $tag]['form'] = fivestar_widget_form($entity, $tag);
-                $entity->content['fivestar_widget_' . $tag]['#weight'] = ($position == 'above') ? -10 : 50;
-              }
-            }
-            break;
-          } // Fall through to static if not allowed to rate.
-          $position .= '_static';
-        case 'above_static':
-        case 'below_static':
-          $content = '';
-          foreach (fivestar_get_tags() as $tag) {
-            if (fivestar_validate_target('node', $entity->nid, $tag)) {
-              $content .= fivestar_static('node', $entity->nid, $entity->type, $tag);
-            }
-          }
-          if ($content) {
-            $entity->content['fivestar_widget'] = array(
-              '#markup' => $content,
-              '#weight' => strpos($position, 'above') === 0 ? -10 : 50,
-            );
-          }
-
-          break;
-        case 'link':
-          $entity->content['links']['fivestar_widget'] = array(
-            '#links' => array(
-              'fivestar-rate' => array(
-                'title' => t('Rate'),
-                'href' => 'node/'. $entity->nid,
-                'fragment' => 'fivestar-form-node-'. $entity->nid,
-                'attributes' => array('title' => t('Rate this @type', array('@type' => _node_types_build()->types[$entity->type]->name))),
-              ),
-            ),
-          );
-          break;
-      }
-    }
-  }
-}
-
-function fivestar_block_info() {
-  $blocks[0]['info'] = t('Fivestar: Rate this node');
-  return $blocks;
-}
-
-function fivestar_block_view($delta = 0) {
-  if (user_access('access content') && (arg(2) == '' || arg(2) == 'view') && ($node = menu_get_object())) {
-    if (user_access('rate content')) {
-      $block = array('subject' => t('Rate This'));
-      foreach (fivestar_get_tags() as $tag) {
-        if (fivestar_validate_target('node', $node->nid, $tag)) {
-          $block['content'][$tag] = fivestar_widget_form($node, $tag);
-        }
-      }
-      return $block;      
-    }
-    else {
-      $block = array('subject' => t('Fivestars'));
-      foreach (fivestar_get_tags() as $tag) {
-        if (fivestar_validate_target('node', $node->nid, $tag)) {
-          $block['content'][$tag] = array(
-            '#markup' => fivestar_static('node', $node->nid, $node->type, $tag),
-          );
-        }
-      }
-      return $block;
-    }
-  }
-}
-
-function fivestar_widget_form($node, $tag = 'vote') {
-  return drupal_get_form('fivestar_form_node_'. $node->nid .'_'. $tag, 'node', $node->nid, $tag);
-}
-
-/**
  * Get a private token used to protect links from CSRF attacks.
  */
 function fivestar_get_token($value) {
@@ -638,175 +449,6 @@ function fivestar_check_token($token, $value) {
 }
 
 /**
- * Implementation of hook_forms().
- *
- * This is necessary when multiple fivestar forms appear on the same page, each
- * requiring a separate form_id, but all using the same underlying callbacks.
- */
-function fivestar_forms($form_id, $args) {
-  if (strpos($form_id, 'fivestar_form') !== FALSE) {
-    if ($form_id == 'fivestar_form_'. $args[0] .'_'. $args[1] .'_'. $args[2]) {
-      $forms[$form_id] = array('callback' => 'fivestar_form');
-      return $forms;
-    }
-  }
-}
-
-/**
- * Create the fivestar form for the current item.
- * Note that this is not an implementation of hook_form(). We should probably
- * change the function to reflect that.
- */
-function fivestar_form($form, &$form_state, $entity_type, $id, $tag) {
-  global $user;
-
-  if ($entity_type == 'node') {
-    if (is_numeric($id)) {
-      $node = node_load($id);
-    }
-    else {
-      return array();
-    }
-  }
-
-  $suffix = fivestar_get_suffix($node->type, $tag);
-  $star_display = variable_get('fivestar_style_' . $suffix, 'average');
-  $text_display = variable_get('fivestar_text_' . $suffix, 'dual');
-
-  if ($star_display == 'average' && ($text_display == 'average' || $text_display == 'none')) {
-    // Save a query and don't retrieve the user vote unnecessarily.
-    $votes = fivestar_get_votes($entity_type, $id, $tag, 0);
-  }
-  else {
-    $votes = fivestar_get_votes($entity_type, $id, $tag);
-  }
-
-  $values = array(
-    'user' => isset($votes['user']['value']) ? $votes['user']['value'] : 0,
-    'average' => isset($votes['average']['value']) ? $votes['average']['value'] : 0,
-    'count' => isset($votes['count']['value']) ? $votes['count']['value'] : 0,
-  );
-
-  $settings = array(
-    'stars' => variable_get('fivestar_stars_' . $suffix, 5),
-    'allow_clear' => variable_get('fivestar_unvote_' . $suffix, FALSE),
-    'style' => $star_display,
-    'text' => $text_display,
-    'content_type' => $entity_type,
-    'content_id' => $id,
-    'tag' => 'vote',
-    'autosubmit' => TRUE,
-    'title' => variable_get('fivestar_title_' . $suffix, 1) ? NULL : FALSE,
-    'feedback_enable' => variable_get('fivestar_feedback_' . $suffix, 1),
-    'labels_enable' => variable_get('fivestar_labels_enable_' . $suffix, 1),
-    'labels' => variable_get('fivestar_labels_' . $suffix, array()),
-    'tag' => $tag,
-  );
-
-  return fivestar_custom_widget(array(), $form_state, $values, $settings);
-}
-
-/**
- * Retrieve and print out a static display of stars for a piece of content.
- *
- * @param $entity_type
- *   The type of entity that will have its vote retrieved. i.e. "node".
- * @param $id
- *   The ID of the content that will have its vote retrieved.
- * @param $bundle
- *   Optional. If retrieving a node's rating, passing in the bundle will
- *   prevent Fivestar from doing an additional query to find it.
- * @param $tag
- *   Optional. The voting tag that will be retrieved. Defaults to "vote" if none
- *   is specified.
- */
-function fivestar_static($entity_type, $id, $bundle = NULL, $tag = 'vote') {
-  global $user;
-
-  $criteria = array(
-    'content_type' => $entity_type,
-    'content_id' => $id,
-    'value_type' => 'percent',
-    'tag' => 'vote',
-  );
-
-  $votes = fivestar_get_votes($entity_type, $id, $tag);
-
-  if ($entity_type == 'node') {
-    // The bundle should always be passed to avoid this node load.
-    // !TODO: Remove the node_load, a direct query would be better.
-    if (!isset($bundle)) {
-      $node = node_load($id);
-      $bundle = $node->type;
-    }
-
-    $settings = fivestar_get_settings($bundle, $tag);
-    $stars = $settings['stars'];
-    switch ($settings['star_display']) {
-      case 'average':
-      case 'dual':
-        $star_value = (isset($votes['average']['value'])) ? $votes['average']['value']: '';
-        $title = $settings['title_display'] ? t('Average') : NULL;
-        break;
-      case 'user':
-        $star_value = (isset($votes['user']['value'])) ? $votes['user']['value'] : '';
-        $title = $settings['title_display'] ? t('Your rating') : NULL;
-        break;
-      case 'smart':
-        $star_value = (isset($votes['user']['value'])) ? $votes['user']['value'] : $votes['average']['value'];
-        $title = $settings['title_display'] ? $votes['user']['value'] ? t('Your rating') : t('Average') : NULL;
-        break;
-    }
-
-    if ($tag != 'vote') {
-      $title .= ' (' . ucfirst($tag) . ')';
-    }
-
-    // Set all text values, then unset the unnecessary ones.
-    $user_value = (isset($votes['user']['value'])) ? $votes['user']['value'] : NULL;
-    $average_value = (isset($votes['average']['value'])) ? $votes['average']['value'] : NULL;
-    $count_value = (isset($votes['count']['value'])) ? $votes['count']['value'] : NULL;
-    switch ($settings['text_display']) {
-      case 'average':
-        $user_value = NULL;
-        break;
-      case 'user':
-        $average_value = NULL;
-        break;
-      case 'smart':
-        if ($votes['user']['value']) {
-          $average_value = NULL;
-        }
-        else {
-          $user_value = NULL;
-        }
-        break;
-    }
-  }
-  // Possibly add other content types here (comment, user, etc).
-  else {
-    $stars = 5;
-    $star_value = $votes['average']['value'];
-    $user_value = $votes['user']['value'];
-    $average_value = $votes['average']['value'];
-    $count_value = $votes['count']['value'];
-  }
-
-  $star_display = theme('fivestar_static', array(
-    'rating' => $star_value,
-    'stars' => $stars,
-  ));
-  $text_display = $settings['text_display'] == 'none' ? NULL : theme('fivestar_summary', array(
-    'user_rating' => $user_value,
-    'average_rating' => $average_value,
-    'votes' => $count_value,
-    'stars'=> $stars,
-    'feedback_enable' =>FALSE,
-  ));
-  return theme('fivestar_static_element', array('star_display' => $star_display, 'title' => $title, 'description' => $text_display));
-}
-
-/**
  * Form builder; Build a custom Fivestar rating widget with arbitrary settings.
  *
  * This function is usually not called directly, instead call
@@ -1316,7 +958,7 @@ function fivestar_views_widget_handler($value, $field, $columns, $summary) {
   }
 
   if ($field->view->base_table == 'node') {
-
+    $instance = field_info_instance('node', $field['field_name'], $columns->node_type);
     // Find the VotingAPI tag for this field.
     foreach ($field->query->table_queue[$field->relationship]['join']->extra as $votingapi_setting) {
       if ($votingapi_setting['field'] == 'tag') {
@@ -1354,18 +996,16 @@ function fivestar_views_widget_handler($value, $field, $columns, $summary) {
     }
 
     $settings = array(
-      'stars' => variable_get('fivestar_stars_'. $node_type, 5),
-      'allow_clear' => variable_get('fivestar_unvote_'. $node_type, FALSE),
+      'stars' => $field['settings']['stars'],
+      'allow_clear' => isset($instance['settings']['allow_clear']) ? $instance['settings']['allow_clear'] : FALSE,
       'style' => $field->table == 'votingapi_vote' ? 'user' : 'average',
-      'text' => $summary ? variable_get('fivestar_text_'. $node_type, 'dual') : 'none',
+      'text' => $summary ? isset($instance['settings']['text']) ? $instance['settings']['text']: 'dual' : 'none',
       'content_type' => $content_type,
       'content_id' => $content_id,
       'tag' => $tag,
       'autosubmit' => TRUE,
       'title' => FALSE,
-      'feedback_enable' => $summary ? variable_get('fivestar_feedback_'. $node_type, 1) : FALSE,
-      'labels_enable' => $summary ? variable_get('fivestar_labels_enable_'. $node_type, 1) : FALSE,
-      'labels' => $summary ? variable_get('fivestar_labels_'. $node_type, array()) : array(),
+      'feedback_enable' => $summary ? isset($instance['settings']['feedback_enable']) ? $instance['settings']['feedback_enable'] : TRUE : FALSE,
     );
 
     $form = drupal_get_form('fivestar_custom_widget', $values, $settings);
@@ -1402,47 +1042,6 @@ function fivestar_get_tags() {
 }
 
 /**
- * Gets the variable suffix for node/tag-specific variables.
- *
- * Note that for backwards compatibility, the tag suffix is omitted for the tag
- * "vote". So instead of "story_vote", this just returns "story".
- */
-function fivestar_get_suffix($node_type, $tag) {
-  return $node_type . ($tag == 'vote' ? '' : '_' . $tag);
-}
-
-/**
- * Get all the settings set for a specific node type.
- */
-function fivestar_get_settings($node_type, $tag) {
-  $suffix = fivestar_get_suffix($node_type, $tag);
-
-  $settings = array(
-    'fivestar' => variable_get('fivestar_' . $suffix, 0),
-    'stars' => variable_get('fivestar_stars_' . $suffix, 5),
-    'unvote_enable' => variable_get('fivestar_unvote_' . $suffix, 0),
-    'feedback_enable' => variable_get('fivestar_feedback_'. $suffix, 1),
-    'labels_enable' => variable_get('fivestar_labels_enable_'. $suffix, 1),
-    'labels' => variable_get('fivestar_labels_'. $suffix, array()),
-    'star_display' => variable_get('fivestar_style_' . $suffix, 'average'),
-    'text_display' => variable_get('fivestar_text_' . $suffix, 'dual'),
-    'title_display' => variable_get('fivestar_title_' . $suffix, 1),
-    'position' => variable_get('fivestar_position_' . $suffix, 'below'),
-    'position_teaser' => variable_get('fivestar_position_teaser_' . $suffix, 'hidden'),
-  );
-
-  // Set default labels.
-  if ($settings['stars'] == 5 && empty($settings['labels'])) {
-    $settings['labels'] = array(t('Cancel rating'), t('Poor'), t('Okay'), t('Good'), t('Great'), t('Awesome'));
-  }
-  for ($n = 0; $n <= 10; $n++) {
-    $settings['labels'][$n] = isset($settings['labels'][$n]) ? $settings['labels'][$n] : t('Give it @star/@count');
-  }
-
-  return $settings;
-}
-
-/**
  * Implementation of hook_votingapi_metadata_alter().
  */
 function fivestar_votingapi_metadata_alter(&$data) {
diff --git a/includes/fivestar.admin.inc b/includes/fivestar.admin.inc
index 77641e7..50ee787 100644
--- a/includes/fivestar.admin.inc
+++ b/includes/fivestar.admin.inc
@@ -93,267 +93,3 @@ function fivestar_settings_submit($form, &$form_state) {
   // Rebuild the menu in case tags were changed
   menu_rebuild();
 }
-
-/**
- * Adds fivestar enaable and position to the node-type configuration form.
- */
-function fivestar_node_type_tag_form($form, &$form_state, $node_type, $tag = 'vote') {
-  $type_name = $node_type->type;
-  $settings = fivestar_get_settings($type_name, $tag);
-
-  $form_state['fivestar_tag'] = $tag;
-  $form_state['fivestar_node_type'] = $type_name;
-
-  $form['fivestar'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Enable Fivestar rating for the "@tag" tag', array('@tag' => $tag)),
-    '#default_value' => $settings['fivestar'],
-    '#return_value' => 1,
-    '#weight' => -5,
-  );
-
-  $form['fivestar_stars'] = array(
-    '#type' => 'select',
-    '#title' => t('Number of stars'),
-    '#options' => drupal_map_assoc(range(1, 10)),
-    '#default_value' => $settings['stars'],
-    '#weight' => -4,
-  );
-
-  $form['labels'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Star Labels'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-    '#description' => t('These star labels appear as the link title when javascript is enabled as well as the select list options when javascript is disabled.'),
-  );
-
-  $form['labels']['fivestar_labels_enable'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Display labels on mouse over'),
-    '#default_value' => $settings['labels_enable'],
-    '#return_value' => 1,
-    '#weight' => -5,
-    '#description' => t('When enabled, the star labels will dynamically appear underneath the stars as the user hovers over each star to provide a more descriptive qualitative meaning for each star value.'),
-  );
-
-  // Create the Mouseover text forms for each of the rating options
-  // This form depends on the number of stars, and these extra textfields will be hidden with javascript
-  for ($n = 0; $n <= 10; $n++) {
-    $form['labels']['fivestar_label_'. $n] = array(
-      '#type' => 'textfield',
-      '#title' => $n > 0 ? t('Star @star label', array('@star' => $n)) : t('Cancel label'),
-      '#default_value' => $settings['labels'][$n],
-      '#prefix' => '<div id="fivestar-label-'. $n .'" class="fivestar-label">',
-      '#suffix' => '</div>',
-      '#size' => 30,
-    );
-  }
-
-  $form['direct'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Direct rating widget'),
-    '#collapsible' => FALSE,
-    '#description' => t('These settings allow you to display a rating widget to your users while they are viewing content of this type. Rating will immediately register a vote for that piece of content.'),
-    '#weight' => 2,
-  );
-
-  $form['direct']['fivestar_style'] = array(
-    '#type' => 'select',
-    '#title' => t('Star display style'),
-    '#default_value' => $settings['star_display'],
-    '#options' => array(
-      'average' => t('Display average vote value'),
-      'user'    => t('Display user vote value'),
-      'smart'   => t('User vote if available, average otherwise'),
-      'dual'    => t('Both user and average vote'),
-    ),
-  );
-
-  $form['direct']['fivestar_text'] = array(
-    '#type' => 'select',
-    '#title' => t('Text display style'),
-    '#default_value' => $settings['text_display'],
-    '#options' => array(
-      'none'    => t('Display no text beneath stars'),
-      'average' => t('Current average in text'),
-      'user'    => t('User current vote in text'),
-      'smart'   => t('User vote if available, average otherwise'),
-      'dual'    => t('Both user and average vote'),
-    ),
-  );
-
-  $form['direct']['fivestar_title'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Show widget title'),
-    '#default_value' => $settings['title_display'],
-    '#return_value' => 1,
-  );
-
-  $form['direct']['fivestar_feedback'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Enable feedback during vote saving and deletion'),
-    '#default_value' => $settings['feedback_enable'],
-    '#return_value' => 1
-  );
-
-  $form['direct']['fivestar_unvote'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Allow users to undo their votes'),
-    '#default_value' => $settings['unvote_enable'],
-    '#return_value' => 1,
-  );
-
-  $form['direct']['fivestar_position_teaser'] = array(
-    '#type' => 'select',
-    '#title' => t('Teaser display'),
-    '#default_value' => $settings['position_teaser'],
-    '#options' => array(
-      'above' => t('Clickable widget above teaser'),
-      'below' => t('Clickable widget below teaser'),
-      'above_static' => t('Static display above teaser'),
-      'below_static' => t('Static display below teaser'),
-      'link' => t('Teaser link to full node widget'),
-      'hidden' => '<'. t('hidden') .'>',
-    ),
-  );
-
-  $form['direct']['fivestar_position'] = array(
-    '#type' => 'select',
-    '#title' => t('Full node display'),
-    '#default_value' => $settings['position'],
-    '#options' => array(
-      'above' => t('Clickable widget above node body'),
-      'below' => t('Clickable widget below node body'),
-      'above_static' => t('Static display above node body'),
-      'below_static' => t('Static display below node body'),
-      'hidden' => '<'. t('hidden') .'>',
-    ),
-  );
-
-  $form['direct']['fivestar_direct_preview'] = array(
-    '#type' => 'item',
-    '#title' => t('Direct rating widget preview'),
-    '#markup' => theme('fivestar_preview', array(
-      'style' => $form['direct']['fivestar_style']['#default_value'],
-      'text' => $form['direct']['fivestar_text']['#default_value'],
-      'stars' => $form['fivestar_stars']['#default_value'],
-      'unvote' => $form['direct']['fivestar_unvote']['#default_value'],
-      'title' => $form['direct']['fivestar_title']['#default_value'] ? NULL : FALSE,
-      'feedback_enable' => $form['direct']['fivestar_feedback']['#default_value'],
-      'labels_enable' => $form['labels']['fivestar_labels_enable']['#default_value'],
-      'labels' => $settings['labels'],
-    )),
-  );
-  if (!$form['fivestar']['#default_value']) {
-    $form['direct']['fivestar_direct_preview']['#markup'] = theme('fivestar_preview_wrapper', array('content' => ''));
-  }
-  else {
-    $form['direct']['fivestar_direct_preview']['#markup'] = theme('fivestar_preview_wrapper', array('content' => $form['direct']['fivestar_direct_preview']['#markup']));
-  }
-
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-  );
-
-  return $form;
-}
-
-/**
- * Additional submit handler for the node type form.
- */
-function fivestar_node_type_tag_form_submit($form, &$form_state) {
-  $tag = $form_state['fivestar_tag'];
-  $type_name = $form_state['fivestar_node_type'];
-  $suffix = fivestar_get_suffix($type_name, $tag);
-
-  // Do not save any fivestar variables if fivestar is disabled.
-  if (isset($form_state['values']['fivestar']) && $form_state['values']['fivestar'] === 0) {
-    foreach ($form_state['values'] as $key => $value) {
-      if (strpos($key, 'fivestar') === 0) {
-        variable_del($key . '_' . $suffix);
-      }
-    }
-  }
-  else {
-    if ($form_state['values']['fivestar_labels_enable']) {
-      // Merge labels into a single variable.
-      $labels = array();
-      for ($n = 0; $n <= 10; $n++) {
-        $labels[] = $form_state['values']['fivestar_label_' . $n];
-        unset($form_state['values']['fivestar_label_' . $n]);
-      }
-
-      variable_set('fivestar_labels_' . $suffix, $labels);
-    }
-    else {
-      variable_del('fivestar_labels_' . $suffix);
-    }
-
-    // Now save the remaining variables
-    foreach ($form_state['values'] as $key => $value) {
-      if (strpos($key, 'fivestar') === 0) {
-        variable_set($key . '_' . $suffix, $value);
-      }
-    }
-  }
-
-  drupal_set_message('Your changes have been saved.');
-}
-
-/**
- * Menu callback function for fivestar/preview/node.
- *
- * Outputs a JSON page containing a Fivestar preview of a node rating widget.
- */
-function fivestar_preview() {
-$_POST = array (
-  'style' => 'average',
-  'text' => 'dual',
-  'stars' => '5',
-  'unvote' => '1',
-  'title' => '1',
-  'feedback' => '1',
-  'labels_enable' => '1',
-  'labels' =>
-  array (
-    0 => 'Cancel rating',
-    1 => 'Poor',
-    2 => 'Okay',
-    3 => 'Good',
-    4 => 'Great',
-    5 => 'Awesome',
-    6 => 'Give it @star/@count',
-    7 => 'Give it @star/@count',
-    8 => 'Give it @star/@count',
-    9 => 'Give it @star/@count',
-    10 => 'Give it @star/@count',
-  ),
-);
-  // Perform a few basic security checks.
-  $style = check_plain($_POST['style']);
-  $text = check_plain($_POST['text']);
-  $stars = (int)$_POST['stars'];
-  $unvote = (boolean)$_POST['unvote'];
-  $title = (boolean)$_POST['title'];
-  $feedback_enable = (boolean)$_POST['feedback'];
-  $labels_enable = (boolean)$_POST['labels_enable'];
-  $labels = (array)$_POST['labels'];
-  foreach ($labels as $key => $label) {
-    $labels[$key] = filter_xss_admin($label);
-  }
-
-  $output = theme('fivestar_preview', array(
-    'style' => $style,
-    'text' => $text,
-    'stars' => $stars,
-    'unvote' => $unvote,
-    'title' => $title ? NULL : FALSE,
-    'feedback' => $feedback_enable,
-    'labels_enable' => $labels_enable,
-    'labels' => $labels,
-  ));
-  drupal_add_http_header('Content-Type', 'text/javascript; charset=utf-8');
-  print drupal_json_encode(array('status' => TRUE, 'data' => $output));
-}
diff --git a/includes/fivestar.field.inc b/includes/fivestar.field.inc
index c572405..209121a 100644
--- a/includes/fivestar.field.inc
+++ b/includes/fivestar.field.inc
@@ -161,14 +161,7 @@ function fivestar_field_widget_info() {
  * Implementation of hook_widget_settings_form().
  */
 function fivestar_widget_settings_form($field, $instance) {
-  $form = array();
-  $form['allow_clear'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Allow user to clear value'),
-    '#default_value' => isset($instance['widget']['settings']['allow_clear']) ? $instance['widget']['settings']['allow_clear'] : 1,
-  );
-
-  return $form;
+  // @todo: Add some widget settings here if applicable.
 }
 
 /**
diff --git a/includes/fivestar.theme.inc b/includes/fivestar.theme.inc
index 94fe787..3ad0775 100644
--- a/includes/fivestar.theme.inc
+++ b/includes/fivestar.theme.inc
@@ -97,45 +97,6 @@ function theme_fivestar_preview_widget($variables) {
   return $output;
 }
 
-/**
- * Theme function to add the Fivestar preview to the node type form.
- */
-function theme_fivestar_node_type_tag_form($variables) {
-  $form = $variables['form'];
-  drupal_add_js(drupal_get_path('module', 'fivestar') .'/js/fivestar-admin.js');
-  drupal_add_js(array('fivestar' => array('preview_url' => url('fivestar/preview/node'))), 'setting');
-  drupal_add_css(drupal_get_path('module', 'fivestar') .'/css/fivestar-admin.css', 'module', 'all', FALSE);
-
-  $output = '';
-  $output .= drupal_render($form['fivestar']);
-  $output .= drupal_render($form['fivestar_stars']);
-
-  // Star labels.
-  $output .= drupal_render($form['labels']);
-
-  // Direct rating settings form.
-  $direct = '';
-  $direct .= '<div id="fivestar-direct-form">';
-  $direct .= drupal_render($form['direct']['fivestar_style']);
-  $direct .= drupal_render($form['direct']['fivestar_text']);
-  $direct .= drupal_render($form['direct']['fivestar_title']);
-  $direct .= drupal_render($form['direct']['fivestar_unvote']);
-  $direct .= drupal_render($form['direct']['fivestar_feedback']);
-  $direct .= drupal_render($form['direct']['fivestar_position_teaser']);
-  $direct .= drupal_render($form['direct']['fivestar_position']);
-  $direct .= '</div>';
-  $direct .= '<div id="fivestar-direct-preview">';
-  $direct .= drupal_render($form['direct']['fivestar_direct_preview']);
-  $direct .= '</div>';
-
-  $form['direct']['#children'] = $direct;
-  $output .= drupal_render($form['direct']);
-
-  // Any remaining cruft (should be empty).
-  $output .= drupal_render_children($form);
-  return $output;
-}
-
 function theme_fivestar_preview($variables) {
   extract($variables, EXTR_SKIP);
   $values = array(
