diff --git devel_generate/devel_generate.fields.inc devel_generate/devel_generate.fields.inc
index c1e5d37..147fe9f 100644
--- devel_generate/devel_generate.fields.inc
+++ devel_generate/devel_generate.fields.inc
@@ -39,7 +39,7 @@ function devel_generate_fields(&$object, $obj_type, $bundle) {
       $module = $field_types[$field['type']]['module'];
 
       // Include any support file that might exist for this field.
-      if (in_array($module, array('file', 'image', 'taxonomy', 'number', 'text', 'userreference', 'nodereference', 'comment', 'list'))) {
+      if (in_array($module, array('file', 'image', 'taxonomy', 'number', 'text', 'comment', 'list'))) {
         // devel_generate implements on behalf of core and special friends.
         module_load_include('inc', 'devel_generate', "$module.devel_generate");
       }
diff --git devel_generate/nodereference.devel_generate.inc devel_generate/nodereference.devel_generate.inc
deleted file mode 100644
index cd24f45..0000000
--- devel_generate/nodereference.devel_generate.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-function nodereference_devel_generate($object, $field, $instance, $bundle) {
-  if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_CUSTOM) {
-    return devel_generate_multiple('_nodereference_devel_generate', $object, $field, $instance, $bundle);
-  }
-  else {
-    return _nodereference_devel_generate($object, $field, $instance, $bundle);
-  }
-}
-
-function _nodereference_devel_generate($object, $field, $instance, $bundle) {
-  $object_field = array();
-  $allowed_values = nodereference_allowed_values($field);
-  unset($allowed_values[0]);
-  if (!empty($allowed_values)) {
-    // Just pick one of the specified allowed values.
-    $object_field['nid'] = array_rand($allowed_values);
-  }
-  return $object_field;
-}
diff --git devel_generate/userreference.devel_generate.inc devel_generate/userreference.devel_generate.inc
deleted file mode 100644
index b175f3c..0000000
--- devel_generate/userreference.devel_generate.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-function userreference_devel_generate($object, $field) {
-  if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_CUSTOM) {
-    return devel_generate_multiple('_userreference_devel_generate', $object, $field);
-  }
-  else {
-    return _userreference_devel_generate($object, $field);
-  }
-}
-
-function _userreference_devel_generate($object, $field) {
-  $object_field = array();
-  $allowed_values = userreference_allowed_values($field);
-  if (isset($allowed_values['none'])) {
-    unset($allowed_values['none']);
-  }
-  if (!empty($allowed_values)) {
-    // Just pick one of the specified allowed values.
-    $object_field['uid'] = array_rand($allowed_values);
-  }
-  return $object_field;
-}