diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.info b/modules/freelinking_prepopulate/freelinking_prepopulate.info
index 45c50bd..fbdfb9f 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.info
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.info
@@ -4,7 +4,6 @@ package = Input filters
 core = 7.x
 dependencies[] = freelinking
 dependencies[] = prepopulate
-files[] = freelinking_prepopulate.api.php
 files[] = freelinking_prepopulate.install
 files[] = freelinking_prepopulate.module
 files[] = freelinking_prepopulate.utilities.inc
diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.module b/modules/freelinking_prepopulate/freelinking_prepopulate.module
index 14c6df8..2ffbb16 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.module
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.module
@@ -104,7 +104,7 @@ function freelinking_prepopulate_node_settings() {
     '#description' => t('Which content type should be created by Freelinking?'),
   );
 
-  $nodecreate[] = freelinking_prepopulate_list_fields('nodecreate');
+  $nodecreate = freelinking_prepopulate_list_fields('nodecreate');
   if (isset($nodecreate)) {
     foreach ($nodecreate as $key => $value) {
       $options[$key] = $value['title'];
diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc b/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
index 3b0b5da..641db76 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
@@ -142,28 +142,7 @@ function freelinking_prepopulate_list_fields($plugin = 'nodecreate', $field = NU
   static $fields;
   static $plugins;
 
-  // We have fields, and no new one to add.
-  // Return all fields associated with the plugin.
-  if ($fields && !$field) {
-    return array_intersect_key($fields, $plugins[$plugin]);
-  }
-
-  if ($field) {
-    // Define a field with prepopulate, or override.
-    if ($field['prepopulate']) {
-      $fields[$field['field']]['prepopulate'] = $field['prepopulate'];
-    }
-    //Define the title of a new field, or override.
-    if ($field['title']) {
-      $fields[$field['field']]['title'] = $field['title'];
-    }
-    // Add an entry for an existing field to the plugins array.
-    // Uniqueness does not matter.
-    if ($fields[$field['field']]['prepopulate']) {
-      $plugins[$plugin][$field['field']] = TRUE;
-    }
-  }
-
+  // first run: cache some default fields
   if (!$fields) {
     if (module_exists('taxonomy')) {
       $fields['taxonomy'] = array(
@@ -179,6 +158,7 @@ function freelinking_prepopulate_list_fields($plugin = 'nodecreate', $field = NU
       );
       $plugins['nodecreate']['book'] = TRUE;
     }
+    /* we can uncomment this after freelinking_prepopulate's OG stuff is ported from 6 to 7
     if (module_exists('og')) {
       $fields['og'] = array(
         'title' => t('Organic Group audience'),
@@ -189,8 +169,32 @@ function freelinking_prepopulate_list_fields($plugin = 'nodecreate', $field = NU
     if (module_exists('locale')) {
       // To Be Implemented
     }
+    */
   }
-  if (is_array($fields && $plugins[$plugin])) {
+
+  // We have fields, and no new one to add.
+  // Return all fields associated with the plugin.
+  if ($fields && !$field) {
+    return array_intersect_key($fields, $plugins[$plugin]);
+  }
+
+  if ($field) {
+    // Define a field with prepopulate, or override.
+    if ($field['prepopulate']) {
+      $fields[$field['field']]['prepopulate'] = $field['prepopulate'];
+    }
+    //Define the title of a new field, or override.
+    if ($field['title']) {
+      $fields[$field['field']]['title'] = $field['title'];
+    }
+    // Add an entry for an existing field to the plugins array.
+    // Uniqueness does not matter.
+    if ($fields[$field['field']]['prepopulate']) {
+      $plugins[$plugin][$field['field']] = TRUE;
+    }
+  }
+
+  if (is_array($fields) && is_array($plugins[$plugin])) {
     return array_intersect_key($fields, $plugins[$plugin]);
   }
 }