diff --git a/includes/drealty.connection.inc b/includes/drealty.connection.inc
index 24d9a00a29..ebda1303aa 100644
--- a/includes/drealty.connection.inc
+++ b/includes/drealty.connection.inc
@@ -478,20 +478,6 @@ class drealtyConnectionEntityContoller extends EntityAPIControllerExportable {
       unset($resource_mapping->mid, $resource_mapping->conid, $resource_mapping->rid);
     }
 
-    $entity->field_instances = array();
-    $entity->field_fields = array();
-    foreach ($bundles as $bundle) {
-
-      $field_instances = field_info_instances('drealty_listing', $bundle);
-      $entity->field_instances[$bundle] = $field_instances;
-
-      foreach ($field_instances as &$instance) {
-        $field = field_info_field($instance['field_name']);
-        unset($field['id'], $field['bundles'], $field['storage']);
-        $entity->field_fields[$instance['field_name']] = $field;
-      }
-    }
-
     $field_mappings = $dm->ExportFieldMappings($entity->conid);
     foreach ($field_mappings as &$field_mapping) {
       $field_mapping->resource_name = $dm->FetchResource($field_mapping->rid)->systemname;
@@ -571,28 +557,6 @@ class drealtyConnectionEntityContoller extends EntityAPIControllerExportable {
         drupal_write_record('drealty_resource_mappings', $resource_mapping);
       }
 
-      if (isset($entity->field_fields)) {
-        foreach ($entity->field_fields as $field) {
-          if (!field_read_field($field['field_name'], array('include_inactive' => TRUE))) {
-            field_create_field($field);
-          } else {
-            drupal_set_message(t('Skipped creating field %field. A field with this name already exists.', array('%field' => $field['field_name'])), 'warning');
-          }
-        }
-      }
-
-      if (isset($entity->field_instances)) {
-        foreach ($entity->field_instances as $bundle) {
-          foreach ($bundle as $instance) {
-            if (!field_info_instance($instance['entity_type'], $instance['field_name'], $instance['bundle'])) {
-              field_create_instance($instance);
-            } else {
-              drupal_set_message(t('Skipped creating instance %instance. An instance with this name already exists.', array('%field' => $instance['label'])), 'warning');
-            }
-          }
-        }
-      }
-
       foreach ($entity->field_mappings as &$field_mapping) {
         $field_mapping['conid'] = $entity->conid;
         $field_mapping['rid'] = $resources[$field_mapping['resource_name']]['rid'];
diff --git a/includes/drealty.listing.inc b/includes/drealty.listing.inc
index fc11f637bd..eec17847bf 100644
--- a/includes/drealty.listing.inc
+++ b/includes/drealty.listing.inc
@@ -169,57 +169,4 @@ class DrealtyListingTypeController extends EntityAPIControllerExportable {
         ->execute();
     }
   }
-
-  /**
-   *
-   * @param DrealtyListingType $entity
-   * @param string $prefix
-   * @return string 
-   */
-  public function export($entity, $prefix = '') {
-    $vars = get_object_vars($entity);
-    unset($vars[$this->statusKey], $vars[$this->moduleKey], $vars['is_new'], $vars['type'], $vars['label']);
-    if ($this->nameKey != $this->idKey) {
-      unset($vars[$this->idKey]);
-    }
-    if ($entity->type) {
-      $info = $entity->entityInfo();
-      $instances = field_info_instances($info['bundle of'], $entity->type);
-      $fields = array();
-      foreach ($instances as &$instance) {
-        $field = field_info_field($instance['field_name']);
-        unset($field['id'], $field['bundles'], $field['storage']);
-        $fields[$instance['field_name']] = $field;
-        unset($instance['bundle']);
-      }
-
-      $vars['fields'] = $fields;
-      $vars['field_instances'] = $instances;
-    }
-
-    return entity_var_json_export($vars, $prefix);
-  }
-
-  public function save($entity, DatabaseTransaction $transaction = NULL) {
-    parent::save($entity, $transaction);
-
-    if (isset($entity->fields)) {
-      foreach ($entity->fields as $field) {
-        if (!field_read_field($field['field_name'], array('include_inactive' => TRUE))) {
-          field_create_field($field);
-        } else {
-          drupal_set_message(t('Skipped creating field %field. A field with this name already exists.', array('%field' => $field['field_name'])), 'warning');
-        }
-      }
-
-      if (isset($entity->field_instances)) {
-        foreach ($entity->field_instances as $instance) {
-          $instance['bundle'] = $entity->type;
-          if (!field_info_instance($instance['entity_type'], $instance['field_name'], $instance['bundle'])) {
-            field_create_instance($instance);
-          }
-        }
-      }
-    }
-  }
 }
\ No newline at end of file