diff --git a/includes/media_vimeo.formatters.inc b/includes/media_vimeo.formatters.inc
index 7de7f0b..5c1fa54 100644
--- a/includes/media_vimeo.formatters.inc
+++ b/includes/media_vimeo.formatters.inc
@@ -11,15 +11,23 @@ function media_vimeo_file_formatter_info() {
   $formatters['media_vimeo_video'] = array(
     'label' => t('Vimeo Video'),
     'file types' => array('video'),
-    'default settings' => array(),
+    'default settings' => array(
+      'width' => 640,
+      'height' => 360,
+      'preview_uri' => 'vimeo://v/21869117',
+      'api' => 0,
+      'autoplay' => 0,
+      'byline' => 1,
+      'color' => NULL,
+      'loop' => 0,
+      'portrait' => 1,
+      'title' => 1,
+      'protocol' => 'http://',
+    ),
     'view callback' => 'media_vimeo_file_formatter_video_view',
     'settings callback' => 'media_vimeo_file_formatter_video_settings',
   );
 
-  foreach (array('width', 'height', 'preview_uri', 'api', 'autoplay', 'byline', 'color', 'loop', 'portrait', 'title', 'protocol') as $setting) {
-    $formatters['media_vimeo_video']['default settings'][$setting] = media_vimeo_variable_get($setting);
-  }
-
   $formatters['media_vimeo_image'] = array(
     'label' => t('Vimeo Preview Image'),
     'file types' => array('video'),
@@ -227,7 +235,7 @@ function media_vimeo_file_default_displays() {
     'media_original' => array(
       'width' => 640,
       'height' => 390,
-      'autoplay' => media_vimeo_variable_get('autoplay'),
+      'autoplay' => 0,
     ),
   );
   foreach ($default_video_settings as $view_mode => $settings) {
diff --git a/includes/media_vimeo.variables.inc b/includes/media_vimeo.variables.inc
deleted file mode 100644
index decbe01..0000000
--- a/includes/media_vimeo.variables.inc
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * @file media_vimeo/includes/media_vimeo.variables.inc
- * Variable defaults for Media: Vimeo.
- */
-
-/**
- * Define our constants.
- */
-
-/**
- * This is the variable namespace, automatically prepended to module variables.
- */
-define('MEDIA_VIMEO_NAMESPACE', 'media_vimeo__');
-
-/**
- * Wrapper for variable_get() using the Media: Vimeo variable registry.
- *
- * @param string $name
- *  The variable name to retrieve. Note that it will be namespaced by
- *  pre-pending MEDIA_VIMEO_NAMESPACE, as to avoid variable collisions
- *  with other modules.
- * @param unknown $default
- *  An optional default variable to return if the variable hasn't been set
- *  yet. Note that within this module, all variables should already be set
- *  in the media_vimeo_variable_default() function.
- * @return unknown
- *  Returns the stored variable or its default.
- *
- * @see media_vimeo_variable_set()
- * @see media_vimeo_variable_del()
- * @see media_vimeo_variable_default()
- */
-function media_vimeo_variable_get($name, $default = NULL) {
-  // Allow for an override of the default.
-  // Useful when a variable is required (like $path), but namespacing is still
-  // desired.
-  if (!isset($default)) {
-    $default = media_vimeo_variable_default($name);
-  }
-  // Namespace all variables.
-  $variable_name = MEDIA_VIMEO_NAMESPACE . $name;
-  return variable_get($variable_name, $default);
-}
-
-/**
- * Wrapper for variable_set() using the Media: Vimeo variable registry.
- *
- * @param string $name
- *  The variable name to set. Note that it will be namespaced by
- *  pre-pending MEDIA_VIMEO_NAMESPACE, as to avoid variable collisions with
- *  other modules.
- * @param unknown $value
- *  The value for which to set the variable.
- * @return unknown
- *  Returns the stored variable after setting.
- *
- * @see media_vimeo_variable_get()
- * @see media_vimeo_variable_del()
- * @see media_vimeo_variable_default()
- */
-function media_vimeo_variable_set($name, $value) {
-  $variable_name = MEDIA_VIMEO_NAMESPACE . $name;
-  return variable_set($variable_name, $value);
-}
-
-/**
- * Wrapper for variable_del() using the Media: Vimeo variable registry.
- *
- * @param string $name
- *  The variable name to delete. Note that it will be namespaced by
- *  pre-pending MEDIA_VIMEO_NAMESPACE, as to avoid variable collisions with
- *  other modules.
- *
- * @see media_vimeo_variable_get()
- * @see media_vimeo_variable_set()
- * @see media_vimeo_variable_default()
- */
-function media_vimeo_variable_del($name) {
-  $variable_name = MEDIA_VIMEO_NAMESPACE . $name;
-  variable_del($variable_name);
-}
-
-/**
- * The default variables within the Media: Vimeo namespace.
- *
- * @param string $name
- *  Optional variable name to retrieve the default. Note that it has not yet
- *  been pre-pended with the MEDIA_VIMEO_NAMESPACE namespace at this time.
- * @return unknown
- *  The default value of this variable, if it's been set, or NULL, unless
- *  $name is NULL, in which case we return an array of all default values.
- *
- * @see media_vimeo_variable_get()
- * @see media_vimeo_variable_set()
- * @see media_vimeo_variable_del()
- */
-function media_vimeo_variable_default($name = NULL) {
-  static $defaults;
-
-  if (!isset($defaults)) {
-    $defaults = array(
-      'width' => 640,
-      'height' =>360,
-      'preview_uri' => 'vimeo://v/21869117',
-      'api' => 0,
-      'autoplay' => 0,
-      'byline' => 1,
-      'color' => NULL,
-      'loop' => 0,
-      'portrait' => 1,
-      'title' => 1,
-      'protocol' => 'http://',
-    );
-  }
-
-  if (!isset($name)) {
-    return $defaults;
-  }
-
-  if (isset($defaults[$name])) {
-    return $defaults[$name];
-  }
-}
-
-/**
- * Return the fully namespace variable name.
- *
- * @param string $name
- *  The variable name to retrieve the namespaced name.
- * @return string
- *  The fully namespace variable name, prepended with
- *  MEDIA_VIMEO_NAMESPACE.
- */
-function media_vimeo_variable_name($name) {
-  return MEDIA_VIMEO_NAMESPACE . $name;
-}
diff --git a/media_vimeo.install b/media_vimeo.install
index 055a649..ea88e94 100644
--- a/media_vimeo.install
+++ b/media_vimeo.install
@@ -6,27 +6,21 @@
  */
 
 /**
- * Implement hook_install().
+ * Empty update function.
  */
-function media_vimeo_install() {
-  return array();
+function media_vimeo_update_7200() {
+  // Code removed in response to http://drupal.org/node/1911970.
 }
 
 /**
- * Implement hook_uninstall().
+ * Remove obsolete variables.
  */
-function media_vimeo_uninstall() {
-  drupal_load('module', 'media_vimeo');
+function media_vimeo_update_7201() {
+  // Create an array of variables sans 'media_vimeo' prefix.
+  $variables = array('width', 'height', 'preview_uri', 'api', 'autoplay', 'byline', 'color', 'loop', 'portrait', 'title', 'protocol');
 
-  foreach (media_vimeo_variable_default() as $variable => $value) {
-    media_vimeo_variable_del($variable);
+  foreach ($variables as $variable) {
+    // Remove the old variable.
+    variable_del('media_vimeo__' . $variable);
   }
-  return array(array('success' => TRUE, 'query' => "Deleted all variables in the Media: Vimeo namespace."));
-}
-
-/**
- * Empty update function.
- */
-function media_vimeo_update_7200() {
-  // Code removed in response to http://drupal.org/node/1911970.
 }
diff --git a/media_vimeo.module b/media_vimeo.module
index 5b59a23..c0b9b6c 100644
--- a/media_vimeo.module
+++ b/media_vimeo.module
@@ -9,9 +9,6 @@
 // Load all Vimeo file formatters.
 require_once dirname(__FILE__) . '/includes/media_vimeo.formatters.inc';
 
-// A registry of variable_get defaults.
-require_once dirname(__FILE__) . '/includes/media_vimeo.variables.inc';
-
 /**
  * Implements hook_media_internet_providers().
  */