--- sites/default/modules/location/geocoding/google.inc	2009-08-12 11:14:55.000000000 -0400
+++ ../drupal-modules/sites/default/modules/custom/location-gmaps-api-v3/geocoding/google.inc	2009-08-12 13:36:05.000000000 -0400
@@ -99,16 +99,7 @@ function google_geocode_info() {
  *   an associative array with keys 'lat' and 'lon' containing the coordinates.
  */
 function google_geocode_location($location = array()) {
-
-  if (function_exists('gmap_get_key')) {
-    $key = gmap_get_key();
-  }
-  else {
-    $key = variable_get('location_geocode_google_apikey', '');
-  }
-
   $query = array(
-    'key' => $key,
     'sensor' => 'false', // Required by TOS.
     'output' => 'xml',
     //'ll' => 0,
@@ -146,38 +137,6 @@ function google_geocode_location($locati
   return array('lat' => $latlon_exploded[1], 'lon' => $latlon_exploded[0]);
 }
 
-/**
- * General settings for this geocoder.
- */
-function google_geocode_settings() {
-  $form = array();
-  $key = '';
-  if (function_exists('gmap_get_key')) {
-    $key = gmap_get_key();
-  }
-
-  if (!empty($key)) {
-    $form['location_geocode_google_apikey'] = array(
-      '#type' => 'item',
-      '#title' => t('Google Maps API Key'),
-      '#value' => $key,
-      '#description' => t('The key in use was automatically provided by GMap.'),
-    );
-  }
-  else {
-    $form['location_geocode_google_apikey'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Google Maps API Key'),
-      '#size' => 64,
-      '#maxlength' => 128,
-      '#default_value' => variable_get('location_geocode_google_apikey', ''),
-      '#description' => t('In order to use the Google Maps API geocoding web-service, you will need a Google Maps API Key.  You can obtain one at the !sign_up_link for the !google_maps_api.  PLEASE NOTE: You will <em>not</em> have to re-enter your API key for each country for which you have selected Google Maps for geocoding.  This setting is global.', array('!sign_up_link' => '<a href="http://www.google.com/apis/maps/signup.html">sign-up page</a>', '!google_maps_api' => '<a href="http://www.google.com/apis/maps/">Google Maps API</a>'))
-    );
-  }
-
-  return $form;
-}
-
 function _google_geocode_flatten($location = array()) {
   // Check if its a valid address
   if (empty($location)) {