diff --git multiple_fields_remove_button.module multiple_fields_remove_button.module
index 05d210d..eb88d3e 100644
--- multiple_fields_remove_button.module
+++ multiple_fields_remove_button.module
@@ -81,25 +81,8 @@ function multiple_fields_remove_button_field_widget_form_alter(&$element, &$form
     $field_parents,
     array($field_name, $language,$delta));
     
-    // Remove button for the following field type widgets
-    $fieldwidgets = array(
-      'multiple_selects',
-      'text_textfield',
-      'date_popup',
-      'date_text',
-      'link_field',
-      'entityreference_autocomplete',
-      'number',
-      'text_textarea',
-      'text_textarea_with_summary',
-      'addressfield_standard',
-      'location'
-      );
-    // Add extra widgets with the help of others modules.
-    drupal_alter('multiple_field_remove_button_field_widgets', $fieldwidgets);
-    
   if ($context['field']['cardinality'] == FIELD_CARDINALITY_UNLIMITED &&
-    in_array($context['instance']['widget']['type'], $fieldwidgets)) {
+    empty($form_state['programmed'])) {
     $element['remove_button'] = array(
       '#delta' => $delta,
       '#name' => implode('_', $parents) . '_remove_button',