diff --git a/matrix.module b/matrix.module
index d2dac1d..a8be337 100755
--- a/matrix.module
+++ b/matrix.module
@@ -60,9 +60,6 @@ function matrix_field_info() {
       'settings' => array('rows_count' => '', 'cols_count' => '', 'size' => '', 'spreadsheet_style' => ''),
       'default_widget' => 'matrix_grid',
       'default_formatter' => 'matrix_default',
-      // Support hook_entity_property_info() from contrib "Entity API".
-      'property_type' => 'field_item_matrix',
-      'property_callbacks' => array('matrix_field_property_info_callback'),
     ),
     'matrix_custom' => array(
       'label' => t('Matrix (custom)'),
@@ -70,9 +67,6 @@ function matrix_field_info() {
       'settings' => array('rows_count' => '', 'cols_count' => '', 'settings' => ''),
       'default_widget' => 'matrix_grid',
       'default_formatter' => 'matrix_default',
-      // Support hook_entity_property_info() from contrib "Entity API".
-      'property_type' => 'field_item_matrix',
-      'property_callbacks' => array('matrix_field_property_info_callback'),
     ),
   );
 }
@@ -813,6 +807,11 @@ function matrix_field_formatter_view($entity_type, $entity, $field, $instance, $
         $headers = NULL;
       }
 
+      // Make headers translatable.
+      foreach($headers as $key => $value){
+        $headers[$key] = t($value);
+      }
+
       $element[0] = array(
         '#theme' => 'matrix_output', 
         '#header' => $headers, 
@@ -963,53 +962,3 @@ function matrix_allowed_values_example($field) {
 function matrix_custom_processing_example($data) {
   return implode(',', $data);
 }
-
-/**
- * Additional callback to adapt the property info of matrix fields.
- *
- * @see entity_metadata_field_entity_property_info()
- */
-function matrix_field_property_info_callback(&$info, $entity_type, $field, $instance, $field_type) {
-  $property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$field['field_name']];
-  // Define a data structure so it's possible to deal with the row, column and
-  // value.
-  $property['getter callback'] = 'entity_metadata_field_verbatim_get';
-  $property['setter callback'] = 'entity_metadata_field_verbatim_set';
-
-  // Auto-create the field item as soon as a property is set.
-  $property['auto creation'] = 'matrix_field_item_create';
-
-  $property['property info'] = matrix_field_item_property_info();
-  unset($property['query callback']);
-}
-
-/**
- * Callback for creating a new, empty matrix field item.
- *
- * @see matrix_field_property_info_callback()
- */
-function matrix_field_item_create() {
-  return array('row' => NULL, 'col' => NULL, 'value' => NULL);
-}
-
-/**
- * Defines info for the properties of the matrix-field item data structure.
- */
-function matrix_field_item_property_info() {
-  $properties['row'] = array(
-    'type' => 'integer',
-    'label' => t('The row of the item'),
-    'setter callback' => 'entity_property_verbatim_set',
-  );
-  $properties['col'] = array(
-    'type' => 'integer',
-    'label' => t('The column of the item.'),
-    'setter callback' => 'entity_property_verbatim_set',
-  );
-  $properties['value'] = array(
-    'type' => 'text',
-    'label' => t('The value of the item.'),
-    'setter callback' => 'entity_property_verbatim_set',
-  );
-  return $properties;
-}