diff --git a/bakery.module b/bakery.module
index 349347f..5e4be53 100644
--- a/bakery.module
+++ b/bakery.module
@@ -493,12 +493,6 @@ function bakery_settings() {
   $default['mail'] = 'mail';
   $default['name'] = 'name';
   $options = array('name' => t('username'), 'mail' => t('e-mail'), 'status' => t('status'), 'picture' => t('user picture'), 'language' => t('language'), 'signature' => t('signature'), 'timezone' => t('timezone'));
-  if (module_exists('profile')) {
-    $result = db_query('SELECT * FROM {profile_fields} ORDER BY category, weight');
-    while ($field = db_fetch_object($result)) {
-      $options[$field->name] = check_plain($field->title);
-    }
-  }
   $form['bakery_supported_fields'] = array(
     '#type' => 'checkboxes',
     '#title' => 'Supported profile fields',
@@ -1064,21 +1058,12 @@ function bakery_eat_stroopwafel_cookie() {
 
     // If profile field is enabled we manually save profile fields along the way.
     $fields = array();
-    $profile_fields = bakery_get_profile_fields();
     foreach (variable_get('bakery_supported_fields', array('mail' => 'mail', 'name' => 'name')) as $type => $value) {
       if ($value) {
         // If the field is set in the cookie it's being updated, otherwise we'll
         // populate $fields with the existing values so nothing is lost.
         if (isset($stroopwafel[$type])) {
           $fields[$type] = $stroopwafel[$type];
-
-          // If it's a profile field, handle differently.
-          if (array_key_exists($type, $profile_fields)) {
-            db_query("DELETE FROM {profile_values} WHERE fid = %d AND uid = %d", $profile_fields[$type], $account->uid);
-            db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $profile_fields[$type], $account->uid, $stroopwafel[$type]);
-            // Since we've saved it we make sure profile module itself doesn't.
-            unset($fields[$type]);
-          }
         }
         else {
           $fields[$type] = $account->$type;
@@ -1103,23 +1088,6 @@ function bakery_eat_stroopwafel_cookie() {
 }
 
 /**
- * Gets data about profile fields regarldess of category and is public.
- *
- * @return array keyed on field name with a value of the fid or empty
- *   if profile module is disabled.
- */
-function bakery_get_profile_fields() {
-  $return = array();
-  if (module_exists('profile')) {
-    $results = db_query("SELECT fid, name FROM {profile_fields}");
-    while ($result = db_fetch_object($results)) {
-      $return[$result->name] = $result->fid;
-    }
-  }
-  return $return;
-}
-
-/**
  * Verify the validation request.
  */
 function bakery_taste_thinmint_cookie() {