diff --git a/INSTALL.txt b/INSTALL.txt
deleted file mode 100644
index 4f5336d..0000000
--- a/INSTALL.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Description:
-------------
-	
-This module provides visitors to your web site with currency conversion rates.
-
-It also provides an API for currency conversion that other modules can use.
-
-Requirements:
--------------
-	
-This module requires drupal 7.x.
-
-Installation:
--------------
-
-1. Copy the entire currency directory under the Drupal modules/ directory.
-
-2. Go to admin/modules and enable 'currency_api' and 'currency'.
-
-3. Allow access to the module under admin/access.
-   You can enable it for authenticated and/or anonymous users, depending on
-   your web site needs.
-
-4. Configure the module under admin/config/regional/currency
-   - Specify the default From Currency and the To Currency. You must enter the 
-     three letter code for each. What you enter depends on your country and/or
-     audience.
-
-   - Provide a description. It can be any text you want. You can enter a disclaimer,
-     instructions, ...etc.
-
-   - You can change the navigation link text if you want. Normally leave that as
-     it is.
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 0d5be3e..0000000
--- a/README.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-Copyright 2005 http://2bits.com
-
-Description:
-------------
-
-This module provides visitors to your web site with currency conversion rates.
-
-It also provides a callable API for currency conversion that other modules can
-use.
-
-It relies on Yahoo! Finance for getting the currency exchange data.
-
-Features:
----------
-
-This module provides several options that customize its look and feel:
-
-* An overview section on the top of the page can contain any text you want
-
-* Users can enter an amount, and that amount will calculated in the target
-  currency.
-
-* Provides an input format filter that converts currency tokens like:
-  [currency:from:to:value:decimals] to a currency exchange rate.
-  The 'decimals' parameter is optional.
-  Example: [currency:EUR:USD:100:2].
-
-* Provides a link to a detailed history and chart page on Yahoo Finance.
-
-* All currency conversion operations are logged to the watchdog (optional).
-
-* Provides a callable API for other modules to do currency exchange calculations.
-  See currency_api/API.txt for details.
-
-Database:
----------
-No database changes are required for this module.
-
-Installation:
--------------
-Please see the INSTALL.txt document for details.
-
-Bugs/Features/Patches:
-----------------------
-If you want to report bugs, feature requests, or submit a patch, please do so
-at the project page on the Drupal web site.
-http://drupal.org/project/currency
-
-Author
-------
-Khalid Baheyeldin (http://baheyeldin.com/khalid and http://2bits.com)
-
-Maintainer
-----------
-Andrei Mateescu (http://drupal.org/user/729614)
-
-If you use this module, find it useful, and want to send the author
-a thank you note, then use the Feedback/Contact page at the URL above.
-
-The author can also be contacted for paid customizations of this
-and other modules.
diff --git a/currency_api/API.txt b/currency_api/API.txt
deleted file mode 100644
index 109e1b0..0000000
--- a/currency_api/API.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-The currency module provides two callable API functions that allow other
-modules to do real time currency exchange.
-
-The functions are:
-
-function currency_api_convert($currency_from, $currency_to, $amount = 1)
-
- * This function converts two currencies using exchange rates from Yahoo Finance.
- * The currency codes are standard ISO 3-letter codes, and you can find the details
- * here:
- *  http://www.oanda.com/site/help/iso_code.shtml
- *
- * Here is an example on how to use it:
- *
- *   $from = 'CAD';
- *   $to   = 'USD';
- *   $amt  = 20;
- *   $ret  = currency_api_convert($from, $to, $amt);
- *   if ($ret['status'] == FALSE) {
- *     drupal_set_message(t('An error occured: '). $ret['message']);
- *   }
- *   else {
- *     print $amt . ' ' . $from . ' = ' . $ret['value'] . ' ' . $to;
- *   }
- *
- * @param $currency_from
- *   Currency to convert from.
- * @param $currency_to
- *   Currency to convert to.
- * @param $amount
- *   (optional) Amount to convert. Defaults to 1.
- * @param $decimals
- *   (optional) Number of digits to the right of the decimal point. Leave out this
- *   parameter if you want the actual currency result to proceess it yourself.
- *   Defaults to NULL.
- *
- * @return $result
- *   An associative array that contains the following:
- *    $result['status'] - TRUE or FALSE
- *    $result['message'] - 'success' when status is TRUE, otherwise, contains a
- *                         descriptive error text
- *   The following items are only returned when status is TRUE
- *    $result['value'] - $amount * exchange rate of $currency_from into $currency_to
- *    $result['rate'] - Exchange rate of $currency_from into $currency_to
- *    $result['timestamp'] - Timestamp of the last update to the rates
- *    $result['date'] - Date of the last update to the rates (Format is "m/d/yyyy")
- *    $result['time'] - Time of the last update to the rates (Format is "h:mmpm")
-
-function currency_api_get_desc($currency)
-
- * This function gets the currency name for a standard ISO 3-letter codes,
- * You can find the details here:
- *  http://www.oanda.com/site/help/iso_code.shtml
- *
- * Here is an example on how to use it:
- *
- *   $ccode = 'CAD';
- *   $ret = currency_get_description($ccode);
- *   if ($ret == FALSE)
- *   {
- *     drupal_set_message(t('Could not get description'));
- *   }
- *   else
- *   {
- *     print $ccode .' => '. $ret;
- *   }
- *
- * @param $currency
- *   Currency code (3-letter ISO)
- *
- * @return $result
- *   Contains FALSE if the currency cannot be found, otherwise, it
- *   has the description.
-
-function currency_api_get_symbol($currency)
-
- * This function gets the currency symbol for a standard ISO 3-letter codes,
- * You can find the details here:
- *  http://www.oanda.com/site/help/iso_code.shtml
- *
- * Here is an example on how to use it:
- *
- *   $ccode = 'CAD';
- *   $ret = currency_api_get_symbol($ccode);
- *   if ($ret == FALSE) {
- *     drupal_set_message(t('Could not get symbol'));
- *   }
- *   else {
- *     print $ccode .' => '. $ret;
- *   }
- *
- * @param $currency
- *   Currency code (3-letter ISO)
- *
- * @return $result
- *   Contains FALSE if the currency symbol cannot be found, otherwise, it
- *   has the symbol.
-
-function currency_api_get_list()
-
- * Returns a list of supported currencies
diff --git a/currency_api/currency_api.info b/currency_api/currency_api.info
deleted file mode 100755
index 88decce..0000000
--- a/currency_api/currency_api.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = Currency API
-description = Provides an API for currency conversion.
-package = Currency 
-core = 7.x
-files[] = currency_api.module
-configure = admin/config/regional/currency_api
diff --git a/currency_api/currency_api.install b/currency_api/currency_api.install
deleted file mode 100644
index afd98d2..0000000
--- a/currency_api/currency_api.install
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file
- *   This module provides an API for currency conversion.
- */
-
-/**
- * Implements hook_schema().
- *
- * Define schema for currencyapi database
- */
-function currency_api_schema() {
-  $schema['currencyapi'] = array(
-    'description' => 'Table to cache currency rates that have been looked up by the Currency API module.',
-    'fields' => array(
-      'currency_from' => array(
-        'description' => 'ISO 4217 3-character currency code for destination currency, as a character string.',
-        'type' => 'varchar',
-        'length' => 10,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'currency_to' => array(
-        'description' => 'ISO 4217 3-character currency code for destination currency, as a character string.',
-        'type' => 'varchar',
-        'length' => 10,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'rate' => array(
-        'description' => 'Conversion rate, currency_to per currency_from, as a floating point number.',
-        'type' => 'float',
-        'size' => 'normal',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'timestamp' => array(
-        'description' => 'The time that the conversion rate was created, or last edited by its author, as a Unix timestamp.',
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-    ),
-    'primary key' => array('currency_from', 'currency_to'),
-  );
-
-  return $schema;
-}
-
-/**
- * Implements hook_uninstall().
- *
- * This will automatically remove the variables defined by Currency API.
- */
-function currency_api_uninstall() {
-  db_query("DELETE FROM {variable} WHERE name LIKE 'currency_api%'");
-}
diff --git a/currency_api/currency_api.module b/currency_api/currency_api.module
deleted file mode 100644
index 3138514..0000000
--- a/currency_api/currency_api.module
+++ /dev/null
@@ -1,622 +0,0 @@
-<?php
-
-/**
- * @file
- * This module provides an API for currency conversion.
- */
-
-// Copyright 2005 Khalid Baheyeldin http://2bits.com
-
-// 3600 is once an hour
-define('UPDATE_FREQUENCY', 3600);
-
-/**
- * Implements hook_help().
- */
-function currency_api_help($path, $arg) {
-  switch ($path) {
-    case 'admin/help#currency_api':
-      return t('This module provides an API for currency conversion.');
-  }
-}
-
-/**
- * Implements hook_theme().
- */
-function currency_api_theme() {
-  return array(
-    'currency_api_amount' => array('arguments' => array('amount' => NULL, 'attributes' => NULL)),
-  );
-}
-
-/**
- * Implements hook_menu().
- */
-function currency_api_menu() {
-  $items['admin/config/regional/currency_api'] = array(
-    'title' => 'Currency API',
-    'description' => 'Settings for currency API.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('currency_api_admin_settings'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-  );
-  return $items;
-}
-
-/**
- * Menu callback; module settings form.
- */
-function currency_api_admin_settings() {    
-  $form['currency_api_watchdog'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Log all currency exchange requests to watchdog'),    
-    '#default_value' => variable_get('currency_api_watchdog', 1),    
-  );
-
-  $period = drupal_map_assoc(array(900, 1800, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
-  $form['currency_api_fetch'] = array(
-    '#type' => 'select',
-    '#title' => t('Currency data update frequency'),
-    '#default_value' => variable_get('currency_api_fetch', UPDATE_FREQUENCY),
-    '#options' => $period,
-    '#description' => t('How long to keep the currency data from Yahoo! Finance. Default is 1 hour (3600 seconds).'),
-  );
-
-  return system_settings_form($form);
-}  
-
-/**
- * Currency exchange rate API function.
- *
- * This function converts two currencies using exchange rates from Yahoo Finance.
- * The currency codes are standard ISO 3-letter codes, and you can find the details
- * here:
- *  http://www.oanda.com/site/help/iso_code.shtml
- *
- * Here is an example on how to use it:
- *
- *   $from = 'CAD';
- *   $to   = 'USD';
- *   $amt  = 20;
- *   $ret  = currency_api_convert($from, $to, $amt);
- *   if ($ret['status'] == FALSE) {
- *     drupal_set_message(t('An error occured: '). $ret['message']);
- *   }
- *   else {
- *     print $amt . ' ' . $from . ' = ' . $ret['value'] . ' ' . $to;
- *   }
- *
- * @param $currency_from
- *   Currency to convert from.
- * @param $currency_to
- *   Currency to convert to.
- * @param $amount
- *   (optional) Amount to convert. Defaults to 1.
- * @param $decimals
- *   (optional) Number of digits to the right of the decimal point. Leave out this
- *   parameter if you want the actual currency result to proceess it yourself.
- *   Defaults to NULL.
- *
- * @return $result
- *   An associative array that contains the following:
- *    $result['status'] - TRUE or FALSE
- *    $result['message'] - 'success' when status is TRUE, otherwise, contains a
- *                         descriptive error text
- *   The following items are only returned when status is TRUE
- *    $result['value'] - $amount * exchange rate of $currency_from into $currency_to
- *    $result['rate'] - Exchange rate of $currency_from into $currency_to
- *    $result['timestamp'] - Timestamp of the last update to the rates
- *    $result['date'] - Date of the last update to the rates (Format is "m/d/yyyy")
- *    $result['time'] - Time of the last update to the rates (Format is "h:mmpm")
- */
-function currency_api_convert($currency_from, $currency_to, $amount = 1, $decimals = NULL) {
-  $currency_array = array(
-    's'  => 'Currencies',
-    'l1' => 'Last',
-    'd1' => 'Date',
-    't1' => 'Time'
-  );
-
-  $result = array();
-  $result['status'] = FALSE;
-  $result['message'] = NULL;
-  $result['value'] = 0;
-  $result['rate'] = 1.0;
-  $result['timestamp'] = NULL;
-  $result['date'] = NULL;
-  $result['time'] = NULL;
-
-  $from = drupal_strtoupper($currency_from);
-  $to   = drupal_strtoupper($currency_to);
-
-  if ($from == $to) {
-    return array(
-      'status' => TRUE,
-      'message' => 'success',
-      'value' => $amount,
-
-      'rate' => 1.0,
-      'timestamp' => REQUEST_TIME,
-      'date' => date('n/j/Y'),
-      'time' => date('g:ia'),
-    );
-  }
-
-  // Load cached rate, if exists.
-  $record = NULL;
-  $cached = currency_api_load($record, $currency_from, $currency_to);
-
-  if (!$record) {
-    // Cached rate not found, go get it.
-    $url = 'http://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=' . currency_api_get_fields($currency_array) . '&s=' . $from . $to . '=X';
-
-    // Validate the passed currency codes, to make sure they are valid.
-    if (FALSE == currency_api_get_desc($from)) {
-      $msg = t("currency: Invalid currency_from = %from", array('%from' => $from));
-      currency_log($msg, WATCHDOG_ERROR);
-      $result['message'] = $msg;
-      $result['status'] = FALSE;
-    }
-
-    if (FALSE == currency_api_get_desc($to)) {
-      $msg = t("currency: Invalid currency_to = %to", array('%to' => $to));
-      currency_log($msg, WATCHDOG_ERROR);
-      return FALSE;
-      $result['message'] = $msg;
-      $result['status'] = FALSE;
-    }
-
-    if (!is_numeric($amount)) {
-      $msg = t("currency: Invalid amount = %amount", array('%amount' => $amount));
-      currency_log($msg, WATCHDOG_ERROR);
-      $result['message'] = $msg;
-      $result['status'] = FALSE;
-    }
-
-    $http_result = drupal_http_request($url);
-    if (isset($http_result->error)) {
-      $msg = t('currency: drupal_http_request error: @error', array('@error' => $http_result->error));
-      currency_log($msg, WATCHDOG_ERROR);
-      return FALSE;
-    }
-
-    if ($http_result->code != 200) {
-      $msg = t('currency: drupal_http_request code: @code', array('@code' => $http_result->code));
-      currency_log($msg, WATCHDOG_ERROR);
-      return FALSE;
-    }
-
-    $record = $http_result->data;
-  }
-
-  if (!$record) {
-    $msg = t('currency: cannot contact Yahoo Finance host');
-    currency_log($msg, WATCHDOG_ERROR);
-    $result['status'] = FALSE;
-    $result['message'] = $msg;
-  }
-  else {
-    $currency_data = explode(',', $record);
-    $rate = $currency_data[1];
-    $date = $currency_data[2];
-    $time = $currency_data[3];
-    $timestamp = strtotime(str_replace('"', '', $date) . ' ' . str_replace('"', '', $time));
-
-    // Calculate the result.
-    $value = $amount * $rate;
-
-    // Format the result if $decimals value was specified.
-    if ($decimals) {
-      if (module_exists('format_number')) {
-        $value = format_number($value, $decimals);
-      }
-      else {
-        $value = number_format($value, $decimals);
-      }
-    }
-
-    // Log it.
-    $msg = t("currency: @amount @from = @value @to", array('@amount' => $amount, '@from' => $from, '@value' => $value, '@to' => $to));
-    currency_log($msg, WATCHDOG_NOTICE);
-
-    // Got what we need.
-    $result['value'] = $value;
-    $result['rate'] = $rate;
-    $result['timestamp'] = $timestamp;
-    $result['date'] = $date;
-    $result['time'] = $time;
-    $result['status'] = TRUE;
-    $result['message'] = 'success';
-
-    if (!$cached) {
-      // Cache rate does not exist, save it.
-      currency_api_save($currency_from, $currency_to, $rate);
-    }
-  }
-
-  return $result;
-}
-
-/**
- * Currency exchange API function.
- *
- * This function gets the currency name for a standard ISO 3-letter codes,
- * You can find the details here:
- *  http://www.oanda.com/site/help/iso_code.shtml
- *
- * Here is an example on how to use it:
- *
- *   $ccode = 'CAD';
- *   $ret = currency_get_description($ccode);
- *   if ($ret == FALSE) {
- *     drupal_set_message(t('Could not get description'));
- *   }
- *   else {
- *     print $ccode .' => '. $ret;
- *   }
- *
- * @param string $currency
- *   Currency code (3-letter ISO).
- *
- * @return $result
- *   Contains FALSE if the currency cannot be found, otherwise, it
- *   has the description.
- */
-function currency_api_get_desc($currency) {
-  $list = currency_api_get_list();
-  if (isset($list[$currency])) {
-    return $list[$currency];
-  }
-  return FALSE;
-}
-
-/**
- * Returns an array of all currency names.
- */
-function currency_api_get_list() {
-  static $list;
-  if (!isset($list)) {
-    $currencies = currency_api_get_currencies();
-    $list = array();
-    foreach ($currencies as $code => $currency) {
-      $list[$code] = $currency['name'];
-    }
-  }
-  return $list;
-}
-
-/**
- * Returns an array of all currency symbols.
- */
-function currency_api_get_symbols() {
-  static $symbols;
-  if (!isset($symbols)) {
-    $currencies = currency_api_get_currencies();
-    $symbols = array();
-    foreach ($currencies as $code => $currency) {
-      $symbols[$code] = $currency['symbol'];
-    }
-  }
-  return $symbols;
-}
-
-/**
- * Returns the symbol for a currency code.
- *
- * @param string $code
- *   Currency code (3-letter ISO).
- *
- * @return $result
- *   Returns the symbol for the provided currency code or NULL if not found.
- */
-function currency_api_get_symbol($code) {
-  $symbols = currency_api_get_symbols();
-  return isset($symbols[$code]) ? $symbols[$code] : NULL;
-}
-
-/**
- * Helper function to build yahoo finance api request.
- */
-function currency_api_get_fields($array) {
-  $field_string = NULL;
-
-  while (list($field, $header) = each($array)) {
-    $field_string = $field_string . $field;
-  }
-  
-  return $field_string;
-}
-
-/**
- * Helper function to log messages to watchdog.
- */
-function currency_log($msg = '', $severity = WATCHDOG_NOTICE, $type = 'currency') {
-  if ($severity == WATCHDOG_ERROR || variable_get('currency_api_watchdog', 1)) {
-    watchdog($type, $msg, array(), $severity);
-  }
-}
-
-/**
- * Fetch cached rate for from and to currencies.
- * Retrieve from static array variable, else from database.
- *
- * @return
- *   Rate by reference, true if exists otherwise false.
- */
-function currency_api_load(&$record, $currency_from, $currency_to) {
-  static $rate = array();
-  $cached = TRUE;
-
-  if (isset($rate[$currency_from][$currency_to])) {
-    // retrieve cached rate from static array variable
-    $record = $rate[$currency_from][$currency_to];
-  }
-  else {
-    $result = db_query("SELECT * FROM {currencyapi} WHERE currency_from = :currency_from AND currency_to = :currency_to AND timestamp > :timestamp", array(':currency_from' => $currency_from, ':currency_to' => $currency_to, ':timestamp' => REQUEST_TIME - variable_get('currency_api_fetch', UPDATE_FREQUENCY)))->fetchObject();
-    if ($result) {
-      $currency = array($currency_from . $currency_to . '=X', $result->rate, date('n/j/Y', $result->timestamp), date('g:ia', $result->timestamp));
-      $record = implode(',', $currency);
-      // cache rate in static array variable for subsequent queries
-      $rate[$currency_from][$currency_to] = $record;
-    }
-    else {
-      // rate does not exist in database cache
-      $record = NULL;
-      $cached = FALSE;
-    }
-  }
-
-  return $cached;
-}
-
-/**
- * Cache rate for from and to countries delete outdated record, if exists.
- *
- * @param string $currency_from
- * @param string $currency_to
- * @param decimal $rate
- */
-function currency_api_save($currency_from, $currency_to, $rate) {
-  // Insert or update record.
-  db_merge('currencyapi')
-    ->key(array(
-      'currency_from' => $currency_from,
-      'currency_to' => $currency_to,
-    ))
-    ->fields(array(
-      'rate' => $rate,
-      'timestamp' => REQUEST_TIME,
-    ))
-    ->execute();
-}
-
-/**
- * Custom theme to display currency amount.
- *
- * Default output example: $200.00 USD
- *
- * @param string $amount
- * @param array $attributes
- *
- * @return string
- *   Formatted string.
- */
-function theme_currency_api_amount($amount, $attributes) {
-  return t('!symbol!amount !code', array('!symbol' => $attributes['symbol'], '!amount' => number_format($amount, $attributes['decimals']), '!code' => $attributes['code']));
-}
-
-/**
- * Implements hook_filter_info().
- */
-function currency_api_filter_info() {
-  $filters['currency_exchange'] = array(
-    'title' => t('Currency exchange'),
-    'description' => t("Converts currency tokens ([currency:from:to:value:decimals]) to a currency exchange rate. The 'decimals' parameter is optional. Eg: [currency:EUR:USD:100:2]."),
-    'process callback' => '_currency_api_filter',
-  );
-  return $filters;
-}
-
-/**
- * Converts currency tokens.
- */
-function _currency_api_filter($text) {
-  return preg_replace_callback('/\[currency:(.*?)\]/i', '_currency_api_filter_process', $text);
-}
-
-/**
- * Processes values for the currency api filter.
- */
-function _currency_api_filter_process($matches) {
-  $return = $matches[1];
-  $convert = explode(':', $matches[1]);
-
-  $result = currency_api_convert($convert[0], $convert[1], $convert[2], $convert[3]);
-
-  if ($result['status']) {
-    $return = $result['value'];
-  }
-
-  return $return;
-}
-
-/**
- * Returns an array of all currency properties.
- */
-function currency_api_get_currencies() {
-  return array(
-    'AFN' => array('name' => t('Afghanistani Afghani (AFN)'), 'symbol' => '؋', 'decimals' => 2),
-    'ALL' => array('name' => t('Albanian Lek (ALL)'), 'symbol' => 'Lek', 'decimals' => 2),
-    'DZD' => array('name' => t('Algerian Dinar (DZD)'), 'symbol' => 'دج', 'decimals' => 2),
-    'ARS' => array('name' => t('Argentine Peso (ARS)'), 'symbol' => '$', 'decimals' => 2),
-    'AWG' => array('name' => t('Aruba Florin (AWG)'), 'symbol' => 'ƒ', 'decimals' => 2),
-    'AUD' => array('name' => t('Australian Dollar (AUD)'), 'symbol' => '$', 'decimals' => 2),
-    'AZN' => array('name' => t('Azerbaijan New Maneat (AZN)'), 'symbol' => 'ман', 'decimals' => 2),
-    'BSD' => array('name' => t('Bahamian Dollar (BSD)'), 'symbol' => 'D', 'decimals' => 2),
-    'BHD' => array('name' => t('Bahraini Dinar (BHD)'), 'symbol' => '.د.ب', 'decimals' => 2),
-    'BDT' => array('name' => t('Bangladeshi Taka (BDT)'), 'symbol' => '৳, ৲', 'decimals' => 2),
-    'BBD' => array('name' => t('Barbadian Dollar (BBD)'), 'symbol' => 'Bds$', 'decimals' => 2),
-    'BYR' => array('name' => t('Belarus Ruble (BYR)'), 'symbol' => 'p.', 'decimals' => 2),
-    'BZD' => array('name' => t('Belize Dollar (BZD)'), 'symbol' => 'BZ$', 'decimals' => 2),
-    'BMD' => array('name' => t('Bermuda Dollar (BMD)'), 'symbol' => '$', 'decimals' => 2),
-    'BTN' => array('name' => t('Bhutanese Ngultrum (BTN)'), 'symbol' => 'Nu.', 'decimals' => 2),
-    'BOB' => array('name' => t('Bolivian Boliviano (BOB)'), 'symbol' => '$b', 'decimals' => 2),
-    'BAM' => array('name' => t('Bosnia and Herzegovina Convertible Marka (BAM)'), 'symbol' => 'KM', 'decimals' => 2),
-    'BWP' => array('name' => t('Botswana Pula (BWP)'), 'symbol' => 'P', 'decimals' => 2),
-    'BRL' => array('name' => t('Brazilian Real (BRL)'), 'symbol' => 'R$', 'decimals' => 2),
-    'GBP' => array('name' => t('British Pound (GBP)'), 'symbol' => '£', 'decimals' => 2),
-    'BND' => array('name' => t('Brunei Dollar (BND)'), 'symbol' => '$', 'decimals' => 2),
-    'BGN' => array('name' => t('Bulgarian Lev (BGN)'), 'symbol' => 'лв', 'decimals' => 2),
-    'BIF' => array('name' => t('Burundi Franc (BIF)'), 'symbol' => 'FBu', 'decimals' => 2),
-    'KHR' => array('name' => t('Cambodia Riel (KHR)'), 'symbol' => '៛', 'decimals' => 2),
-    'CAD' => array('name' => t('Canadian Dollar (CAD)'), 'symbol' => '$', 'decimals' => 2),
-    'CVE' => array('name' => t('Cape Verdean Escudo (CVE)'), 'symbol' => 'Esc', 'decimals' => 2),
-    'KYD' => array('name' => t('Cayman Islands Dollar (KYD)'), 'symbol' => '$', 'decimals' => 2),
-    'XOF' => array('name' => t('CFA Franc (BCEAO) (XOF)'), 'symbol' => 'F', 'decimals' => 2),
-    'XAF' => array('name' => t('CFA Franc (BEAC) (XAF)'), 'symbol' => 'F', 'decimals' => 2),
-    'CLP' => array('name' => t('Chilean Peso (CLP)'), 'symbol' => '$', 'decimals' => 2),
-    'CNY' => array('name' => t('Chinese Yuan (CNY)'), 'symbol' => '元', 'decimals' => 2),
-    'COP' => array('name' => t('Colombian Peso (COP)'), 'symbol' => '$', 'decimals' => 2),
-    'KMF' => array('name' => t('Comoros Franc (KMF)'), 'symbol' => 'F', 'decimals' => 2),
-    'CRC' => array('name' => t('Costa Rica Colon (CRC)'), 'symbol' => '₡', 'decimals' => 2),
-    'HRK' => array('name' => t('Croatian Kuna (HRK)'), 'symbol' => 'kn', 'decimals' => 2),
-    'CUP' => array('name' => t('Cuban Peso (CUP)'), 'symbol' => '₱', 'decimals' => 2),
-    'CYP' => array('name' => t('Cyprus Pound (CYP)'), 'symbol' => '£', 'decimals' => 2),
-    'CZK' => array('name' => t('Czech Koruna (CZK)'), 'symbol' => 'Kč', 'decimals' => 2),
-    'DKK' => array('name' => t('Danish Krone (DKK)'), 'symbol' => 'kr', 'decimals' => 2),
-    'DJF' => array('name' => t('Dijiboutian Franc (DJF)'), 'symbol' => 'Fdj', 'decimals' => 2),
-    'DOP' => array('name' => t('Dominican Peso (DOP)'), 'symbol' => 'RD$', 'decimals' => 2),
-    'XCD' => array('name' => t('East Caribbean Dollar (XCD)'), 'symbol' => '$', 'decimals' => 2),
-    'EGP' => array('name' => t('Egyptian Pound (EGP)'), 'symbol' => 'LE', 'decimals' => 2),
-    'SVC' => array('name' => t('El Salvador Colon (SVC)'), 'symbol' => '$', 'decimals' => 2),
-    'ERN' => array('name' => t('Eritrean Nakfa (ERN)'), 'symbol' => 'Nfk', 'decimals' => 2),
-    'EEK' => array('name' => t('Estonian Kroon (EEK)'), 'symbol' => 'kr', 'decimals' => 2),
-    'ETB' => array('name' => t('Ethiopian Birr (ETB)'), 'symbol' => 'Br', 'decimals' => 2),
-    'EUR' => array('name' => t('Euro (EUR)'), 'symbol' => '€', 'decimals' => 2),
-    'FKP' => array('name' => t('Falkland Islands Pound (FKP)'), 'symbol' => '£', 'decimals' => 2),
-    'FJD' => array('name' => t('Fiji Dollar (FJD)'), 'symbol' => '$', 'decimals' => 2),
-    'GMD' => array('name' => t('Gambian Dalasi (GMD)'), 'symbol' => 'D', 'decimals' => 2),
-    'GHC' => array('name' => t('Ghanian Cedi (GHC)'), 'symbol' => '¢', 'decimals' => 2),
-    'GIP' => array('name' => t('Gibraltar Pound (GIP)'), 'symbol' => '£', 'decimals' => 2),
-    'XAU' => array('name' => t('Gold Ounces (XAU)'), 'symbol' => 'XAU', 'decimals' => 2),
-    'GTQ' => array('name' => t('Guatemala Quetzal (GTQ)'), 'symbol' => 'Q', 'decimals' => 2),
-    'GGP' => array('name' => t('Guernsey Pound (GGP)'), 'symbol' => '£', 'decimals' => 2),
-    'GNF' => array('name' => t('Guinea Franc (GNF)'), 'symbol' => 'FG', 'decimals' => 2),
-    'GYD' => array('name' => t('Guyana Dollar (GYD)'), 'symbol' => '$', 'decimals' => 2),
-    'HTG' => array('name' => t('Haiti Gourde (HTG)'), 'symbol' => 'G', 'decimals' => 2),
-    'HNL' => array('name' => t('Honduras Lempira (HNL)'), 'symbol' => 'L', 'decimals' => 2),
-    'HKD' => array('name' => t('Hong Kong Dollar (HKD)'), 'symbol' => 'HK$', 'decimals' => 2),
-    'HUF' => array('name' => t('Hungarian Forint (HUF)'), 'symbol' => 'Ft', 'decimals' => 0),
-    'ISK' => array('name' => t('Iceland Krona (ISK)'), 'symbol' => 'kr', 'decimals' => 2),
-    'INR' => array('name' => t('Indian Rupee (INR)'), 'symbol' => '₨', 'decimals' => 2),
-    'IDR' => array('name' => t('Indonesian Rupiah (IDR)'), 'symbol' => 'Rp', 'decimals' => 2),
-    'IRR' => array('name' => t('Iran Rial (IRR)'), 'symbol' => '﷼', 'decimals' => 2),
-    'IQD' => array('name' => t('Iraqi Dinar (IQD)'), 'symbol' => 'ع.د', 'decimals' => 2),
-    'ILS' => array('name' => t('Israeli Shekel (ILS)'), 'symbol' => '₪', 'decimals' => 2),
-    'JMD' => array('name' => t('Jamaican Dollar (JMD)'), 'symbol' => 'J$', 'decimals' => 2),
-    'JPY' => array('name' => t('Japanese Yen (JPY)'), 'symbol' => '¥', 'decimals' => 0),
-    'JOD' => array('name' => t('Jordanian Dinar (JOD)'), 'symbol' => 'din.', 'decimals' => 2),
-    'KZT' => array('name' => t('Kazakhstan Tenge (KZT)'), 'symbol' => 'лв', 'decimals' => 2),
-    'KES' => array('name' => t('Kenyan Shilling (KES)'), 'symbol' => 'KSh', 'decimals' => 2),
-    'KRW' => array('name' => t('Korean Won (KRW)'), 'symbol' => '₩', 'decimals' => 2),
-    'KWD' => array('name' => t('Kuwaiti Dinar (KWD)'), 'symbol' => 'د.ك', 'decimals' => 2),
-    'KGS' => array('name' => t('Kyrgyzstan Som (KGS)'), 'symbol' => 'лв', 'decimals' => 2),
-    'LAK' => array('name' => t('Lao Kip (LAK)'), 'symbol' => '₭', 'decimals' => 2),
-    'LVL' => array('name' => t('Latvian Lat (LVL)'), 'symbol' => 'Ls', 'decimals' => 2),
-    'LBP' => array('name' => t('Lebanese Pound (LBP)'), 'symbol' => '£', 'decimals' => 2),
-    // L for singular, M for plural
-    'LSL' => array('name' => t('Lesotho Loti (LSL)'), 'symbol' => 'M', 'decimals' => 2),
-    'LRD' => array('name' => t('Liberian Dollar (LRD)'), 'symbol' => '$', 'decimals' => 2),
-    'LYD' => array('name' => t('Libyan Dinar (LYD)'), 'symbol' => 'ل.د', 'decimals' => 2),
-    'LTL' => array('name' => t('Lithuanian Lita (LTL)'), 'symbol' => 'Lt', 'decimals' => 2),
-    'MOP' => array('name' => t('Macau Pataca (MOP)'), 'symbol' => 'MOP$', 'decimals' => 2),
-    'MKD' => array('name' => t('Macedonian Denar (MKD)'), 'symbol' => 'ден', 'decimals' => 2),
-    // Non-decimal currency.
-    'MGA' => array('name' => t('Malagasy ariary (MGA)'), 'symbol' => 'Ar', 'decimals' => 0),
-    'MWK' => array('name' => t('Malawian Kwacha (MWK)'), 'symbol' => 'MK', 'decimals' => 2),
-    'MYR' => array('name' => t('Malaysian Ringgit (MYR)'), 'symbol' => 'RM', 'decimals' => 2),
-    'MVR' => array('name' => t('Maldives Rufiyaa (MVR)'), 'symbol' => 'Rf', 'decimals' => 2),
-    'MTL' => array('name' => t('Maltese Lira (MTL)'), 'symbol' => 'Lm', 'decimals' => 2),
-    // Non-decimal currency.
-    'MRO' => array('name' => t('Mauritania Ougulya (MRO)'), 'symbol' => 'UM', 'decimals' => 0),
-    'MUR' => array('name' => t('Mauritius Rupee (MUR)'), 'symbol' => '₨', 'decimals' => 2),
-    'MXN' => array('name' => t('Mexican Peso (MXN)'), 'symbol' => '$', 'decimals' => 2),
-    'MDL' => array('name' => t('Moldovan Leu (MDL)'), 'symbol' => 'lei', 'decimals' => 2),
-    'MNT' => array('name' => t('Mongolian Tugrik (MNT)'), 'symbol' => '₮', 'decimals' => 2),
-    'MAD' => array('name' => t('Moroccan Dirham (MAD)'), 'symbol' => 'د.م.', 'decimals' => 2),
-    'MZM' => array('name' => t('Mozambique Metical (MZM)'), 'symbol' => 'MT', 'decimals' => 2),
-    'MMK' => array('name' => t('Myanmar Kyat (MMK)'), 'symbol' => 'K', 'decimals' => 2),
-    'NAD' => array('name' => t('Namibian Dollar (NAD)'), 'symbol' => '$', 'decimals' => 2),
-    'NPR' => array('name' => t('Nepalese Rupee (NPR)'), 'symbol' => '₨', 'decimals' => 2),
-    'ANG' => array('name' => t('Neth Antilles Guilder (ANG)'), 'symbol' => 'ƒ', 'decimals' => 2),
-    'NZD' => array('name' => t('New Zealand Dollar (NZD)'), 'symbol' => '$', 'decimals' => 2),
-    'NIO' => array('name' => t('Nicaragua Cordoba (NIO)'), 'symbol' => 'C$', 'decimals' => 2),
-    'NGN' => array('name' => t('Nigerian Naira (NGN)'), 'symbol' => '₦', 'decimals' => 2),
-    'KPW' => array('name' => t('North Korean Won (KPW)'), 'symbol' => '₩', 'decimals' => 2),
-    'NOK' => array('name' => t('Norwegian Krone (NOK)'), 'symbol' => 'kr', 'decimals' => 2),
-    'OMR' => array('name' => t('Omani Rial (OMR)'), 'symbol' => '﷼', 'decimals' => 2),
-    'XPF' => array('name' => t('Pacific Franc (XPF)'), 'symbol' => 'F', 'decimals' => 2),
-    'PKR' => array('name' => t('Pakistani Rupee (PKR)'), 'symbol' => '₨', 'decimals' => 2),
-    'XPD' => array('name' => t('Palladium Ounces (XPD)'), 'symbol' => 'XPD', 'decimals' => 2),
-    'PAB' => array('name' => t('Panama Balboa (PAB)'), 'symbol' => 'B/.', 'decimals' => 2),
-    'PGK' => array('name' => t('Papua New Guinea Kina (PGK)'), 'symbol' => 'K', 'decimals' => 2),
-    'PYG' => array('name' => t('Paraguayan Guarani (PYG)'), 'symbol' => 'Gs', 'decimals' => 2),
-    'PEN' => array('name' => t('Peruvian Nuevo Sol (PEN)'), 'symbol' => 'S/.', 'decimals' => 2),
-    'PHP' => array('name' => t('Philippine Peso (PHP)'), 'symbol' => 'Php', 'decimals' => 2),
-    'XPT' => array('name' => t('Platinum Ounces (XPT)'), 'symbol' => 'XPT', 'decimals' => 2),
-    'PLN' => array('name' => t('Polish Zloty (PLN)'), 'symbol' => 'zł', 'decimals' => 2),
-    'QAR' => array('name' => t('Qatar Rial (QAR)'), 'symbol' => '﷼', 'decimals' => 2),
-    'RON' => array('name' => t('Romanian New Leu (RON)'), 'symbol' => 'lei', 'decimals' => 2),
-    'RUB' => array('name' => t('Russian Rouble (RUB)'), 'symbol' => 'руб.', 'decimals' => 2),
-    'RWF' => array('name' => t('Rwandese Franc (RWF)'), 'symbol' => 'RF', 'decimals' => 2),
-    'WST' => array('name' => t('Samoan Tala (WST)'), 'symbol' => 'WS$', 'decimals' => 2),
-    'STD' => array('name' => t('Sao Tome Dobra (STD)'), 'symbol' => 'Db', 'decimals' => 2),
-    'SAR' => array('name' => t('Saudi Arabian Riyal (SAR)'), 'symbol' => '﷼', 'decimals' => 2),
-    'SCR' => array('name' => t('Seychelles Rupee (SCR)'), 'symbol' => '₨', 'decimals' => 2),
-    'RSD' => array('name' => t('Serbian Dinar (RSD)'), 'symbol' => 'Дин.', 'decimals' => 2),
-    'SLL' => array('name' => t('Sierra Leone Leone (SLL)'), 'symbol' => 'Le', 'decimals' => 2),
-    'XAG' => array('name' => t('Silver Ounces (XAG)'), 'symbol' => 'XAG', 'decimals' => 2),
-    'SGD' => array('name' => t('Singapore Dollar (SGD)'), 'symbol' => '$', 'decimals' => 2),
-    'SKK' => array('name' => t('Slovak Koruna (SKK)'), 'symbol' => 'SIT', 'decimals' => 2),
-    'SBD' => array('name' => t('Solomon Islands Dollar (SBD)'), 'symbol' => '$', 'decimals' => 2),
-    'SOS' => array('name' => t('Somali Shilling (SOS)'), 'symbol' => 'S', 'decimals' => 2),
-    'ZAR' => array('name' => t('South African Rand (ZAR)'), 'symbol' => 'R', 'decimals' => 2),
-    'LKR' => array('name' => t('Sri Lanka Rupee (LKR)'), 'symbol' => '₨', 'decimals' => 2),
-    'SHP' => array('name' => t('St Helena Pound (SHP)'), 'symbol' => '£', 'decimals' => 2),
-    // No symbol.
-    // See http://en.wikipedia.org/wiki/Sudanese_pound
-    'SDG' => array('name' => t('Sudanese Pound (SDG)'), 'symbol' => 'SDG', 'decimals' => 2),
-    'SRD' => array('name' => t('Surinam Dollar (SRD)'), 'symbol' => '$', 'decimals' => 2),
-    // L for singular, E for plural
-    'SZL' => array('name' => t('Swaziland Lilageni (SZL)'), 'symbol' => 'E', 'decimals' => 2),
-    'SEK' => array('name' => t('Swedish Krona (SEK)'), 'symbol' => 'kr', 'decimals' => 2),
-    'CHF' => array('name' => t('Swiss Franc (CHF)'), 'symbol' => 'CHF', 'decimals' => 2),
-    'SYP' => array('name' => t('Syrian Pound (SYP)'), 'symbol' => '£', 'decimals' => 2),
-    'TWD' => array('name' => t('Taiwan Dollar (TWD)'), 'symbol' => 'NT$', 'decimals' => 2),
-    // No symbol, but instead an insane formatting.
-    // See http://en.wikipedia.org/wiki/Tanzanian_shilling#Symbol.
-    'TZS' => array('name' => t('Tanzanian Shilling (TZS)'), 'symbol' => 'TZS', 'decimals' => 2),
-    'THB' => array('name' => t('Thai Baht (THB)'), 'symbol' => '฿', 'decimals' => 2),
-    'TOP' => array('name' => t('Tonga Pa\'anga (TOP)'), 'symbol' => 'T$', 'decimals' => 2),
-    'TTD' => array('name' => t('Trinidad & Tobago Dollar (TTD)'), 'symbol' => 'TT$', 'decimals' => 2),
-    'TND' => array('name' => t('Tunisian Dinar (TND)'), 'symbol' => 'د.ت', 'decimals' => 2),
-    'TRY' => array('name' => t('Turkish Lira (TRY)'), 'symbol' => 'TL', 'decimals' => 2),
-    'USD' => array('name' => t('U.S. Dollar (USD)'), 'symbol' => '$', 'decimals' => 2),
-    'AED' => array('name' => t('UAE Dirham (AED)'), 'symbol' => 'د.إ', 'decimals' => 2),
-    'UGX' => array('name' => t('Ugandan Shilling (UGX)'), 'symbol' => 'USh', 'decimals' => 2),
-    // There is a new sign as of March 2004, which is encoded as U+20B4 in
-    // Unicode 4.1 released in 2005. It's not yet supported by most operating
-    // systems, so I opted for the abbrevation instead.
-    'UAH' => array('name' => t('Ukraine Hryvnia (UAH)'), 'symbol' => 'грн.', 'decimals' => 2),
-    'UYU' => array('name' => t('Uruguayan New Peso (UYU)'), 'symbol' => '$U', 'decimals' => 2),
-    'UZS' => array('name' => t('Uzbekistan Sum (UZS)'), 'symbol' => 'лв', 'decimals' => 2),
-    'VUV' => array('name' => t('Vanuatu Vatu (VUV)'), 'symbol' => 'Vt', 'decimals' => 2),
-    'VEB' => array('name' => t('Venezuelan Bolivar (VEB)'), 'symbol' => 'Bs', 'decimals' => 2),
-    'VND' => array('name' => t('Vietnam Dong (VND)'), 'symbol' => '₫', 'decimals' => 2),
-    'YER' => array('name' => t('Yemen Riyal (YER)'), 'symbol' => '﷼', 'decimals' => 2),
-    'YUM' => array('name' => t('Yugoslav Dinar (YUM)'), 'symbol' => 'дин', 'decimals' => 2),
-    'ZMK' => array('name' => t('Zambian Kwacha (ZMK)'), 'symbol' => 'ZK', 'decimals' => 2),
-    'ZWD' => array('name' => t('Zimbabwe Dollar (ZWD)'), 'symbol' => 'Z$', 'decimals' => 2),
-  );
-}
diff --git a/includes/views/currency.views.inc b/includes/views/currency.views.inc
index 177a9ac..b48819e 100644
--- a/includes/views/currency.views.inc
+++ b/includes/views/currency.views.inc
@@ -8,110 +8,4 @@
 /**
  * Implements hook_views_data().
  */
-function currency_views_data() {
-  $data['currencyapi']['table']['group'] = t('Currency');
-
-  $data['currencyapi']['table']['base'] = array(
-    'field' => 'currency_from',
-    'title' => t('Exchange Rates'),
-    'help' => t('Exchange rates provided by the currency_api module'),
-  );
-
-  $data['currencyapi']['currency_from'] = array(
-    'title' => t('Currency from'),
-    'help' => t('The currency that the amount is converted from'),
-    'field' => array(
-      'handler' => 'currency_handler_field_currency',
-    ),
-    'argument' => array(
-      'handler' => 'currency_handler_argument_currency',
-    ),
-    'filter' => array(
-      'handler' => 'currency_handler_filter_currency',
-    ),
-  );
-
-  $data['currencyapi']['currency_to'] = array(
-    'title' => t('Currency to'),
-    'help' => t('The currency that the amount is converted to'),
-    'field' => array(
-      'handler' => 'currency_handler_field_currency',
-    ),
-    'argument' => array(
-      'handler' => 'currency_handler_argument_currency',
-    ),
-    'filter' => array(
-      'handler' => 'currency_handler_filter_currency',
-    ),
-  );
-
-  $data['currencyapi']['rate'] = array(
-    'title' => t('Exchange rate'),
-    'help' => t('The exchange rate used for conversion'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-    ),
-  );
-
-  $data['currencyapi']['timestamp'] = array(
-    'title' => t('Timestamp'),
-    'help' => t('The time that the exchange rate was last updated'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-    ),
-  );
-
-  return $data;
-}
-
-/**
- * Calls currency_api_convert for every exchange rate that should be displayed
- * according to filter and argument settings to ensure that rates are in the
- * database when views performs it's query.
- */
-function currency_views_preload($view) {
-  static $processed = FALSE;
-
-  if (!$processed) {
-    // $this->value for keyed array of selected currencies
-    if ($view->filter['currency_from']) {
-      $selected_from = _currency_views_get_selected_options($view->filter['currency_from']->value);
-    }
-    elseif ($view->argument['currency_from'] && $currency_from = $view->argument['currency_from']->get_value()) {
-      // process argument
-      $selected_from = array($currency_from);
-    }
-
-    if ($view->filter['currency_to']) {
-      $selected_to = _currency_views_get_selected_options($view->filter['currency_to']->value);
-    }
-    elseif ($view->argument['currency_to'] && $currency_to = $view->argument['currency_to']->get_value()) {
-      $selected_to = array($currency_to);
-    }
-
-    if ($selected_from && $selected_to) {
-      // selected currencies - make sure exchange rates are in database by calling currency_api for each from/to currency combination
-      foreach ($selected_from as $currency_from) {
-        foreach ($selected_to as $currency_to) {
-          currency_api_convert($currency_from, $currency_to);
-        }
-      }
-    }
-
-    $processed = TRUE;
-  }
-}
-
-/**
- * Helper function to get the filter's selected options.
- */
-function _currency_views_get_selected_options($options) {
-  foreach ($options as $key => $set) {
-    if ($set) {
-      // i.e. not equal to 0
-      $selected_options[] = $set;
-    }
-  }
-
-  return $selected_options;
-}
+function currency_views_data() {}
\ No newline at end of file
diff --git a/includes/views/handlers/currency_handler_argument_currency.inc b/includes/views/handlers/currency_handler_argument_currency.inc
deleted file mode 100644
index bad81cd..0000000
--- a/includes/views/handlers/currency_handler_argument_currency.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- *   Views argument handler.
- */
-
-class currency_handler_argument_currency extends views_handler_argument {       
-  function query() {      
-    currency_views_preload($this->view);
-    return parent::query();    
-  } 
-
-  /**
-   * Get the title this argument will assign the view, given the argument.
-   *
-   * This usually needs to be overridden to provide a proper title.
-   */
-  function title() {                     
-    $currency_names = currency_api_get_list();
-    return $currency_names[$this->argument];
-  }   
-}
diff --git a/includes/views/handlers/currency_handler_field_currency.inc b/includes/views/handlers/currency_handler_field_currency.inc
deleted file mode 100644
index d3c960a..0000000
--- a/includes/views/handlers/currency_handler_field_currency.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php 
-
-/**
- * @file
- *   Views field handler.
- */
-
-class currency_handler_field_currency extends views_handler_field {
-  function render($values) {  
-    if ($this->options['display_code_only']) {
-      return parent::render($values);
-    }
-    else {                 
-      $currency_names = currency_api_get_list();
-      $value = $currency_names[$values->{$this->field_alias}];
-      return check_plain($value);
-    }
-  }
-    
-  function option_definition() {
-    $options = parent::option_definition();
-    $options['display_code_only'] = array('default' => FALSE);
-    return $options;
-  }
-
-  function options_form(&$form, &$form_state) {
-    parent::options_form($form, $form_state);
-    $form['display_code_only'] = array(
-      '#title' => t('Display as currency code only'),
-      '#description' => t('Hides the descriptive currency name.'),
-      '#type' => 'checkbox',
-      '#default_value' => !empty($this->options['display_code_only']),
-    );
-  }  
-}
diff --git a/includes/views/handlers/currency_handler_filter_currency.inc b/includes/views/handlers/currency_handler_filter_currency.inc
deleted file mode 100644
index db74376..0000000
--- a/includes/views/handlers/currency_handler_filter_currency.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- *   Views filter handler.
- */
-
-class currency_handler_filter_currency extends views_handler_filter_in_operator {     
-  function get_value_options() {
-    $this->value_options = currency_api_get_list();
-  }       
-  
-  function query() {                  
-    currency_views_preload($this->view); 
-    return parent::query();
-  }  
-}