diff --git a/og_example/README.txt b/og_example/README.txt
deleted file mode 100644
index 5518def..0000000
--- a/og_example/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-INSTALLATION
-------------
-1) Enable module and all the dependencies.
-2) In /admin/structure/pages enable the pre-configured "node_view" 
-   (path is /node/%node).
diff --git a/og_example/og_example.features.field_base.inc b/og_example/og_example.features.field_base.inc
deleted file mode 100644
index b87c3d7..0000000
--- a/og_example/og_example.features.field_base.inc
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * @file
- * og_example.features.field_base.inc
- */
-
-/**
- * Implements hook_field_default_field_bases().
- */
-function og_example_field_default_field_bases() {
-  $field_bases = array();
-
-  // Exported field_base: 'body'
-  $field_bases['body'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(
-      0 => 'node',
-    ),
-    'field_name' => 'body',
-    'foreign keys' => array(
-      'format' => array(
-        'columns' => array(
-          'format' => 'format',
-        ),
-        'table' => 'filter_format',
-      ),
-    ),
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(),
-    'translatable' => 1,
-    'type' => 'text_with_summary',
-  );
-
-  // Exported field_base: 'field_node_reference'
-  $field_bases['field_node_reference'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_node_reference',
-    'foreign keys' => array(),
-    'indexes' => array(
-      'target_id' => array(
-        0 => 'target_id',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'entityreference',
-    'settings' => array(
-      'handler' => 'base',
-      'handler_settings' => array(
-        'behaviors' => array(
-          'views-select-list' => array(
-            'status' => 0,
-          ),
-        ),
-        'sort' => array(
-          'direction' => 'ASC',
-          'field' => 'body:value',
-          'property' => 'nid',
-          'type' => 'none',
-        ),
-        'target_bundles' => array(),
-      ),
-      'handler_submit' => 'Change handler',
-      'target_type' => 'node',
-    ),
-    'translatable' => 0,
-    'type' => 'entityreference',
-  );
-
-  // Exported field_base: 'group_group'
-  $field_bases['group_group'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'group_group',
-    'foreign keys' => array(),
-    'indexes' => array(
-      'value' => array(
-        0 => 'value',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'list',
-    'settings' => array(
-      'allowed_values' => array(
-        0 => 'Not a group',
-        1 => 'Group',
-      ),
-      'allowed_values_function' => '',
-    ),
-    'translatable' => 0,
-    'type' => 'list_boolean',
-  );
-
-  // Exported field_base: 'og_group_ref'
-  $field_bases['og_group_ref'] = array(
-    'active' => 1,
-    'cardinality' => -1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'og_group_ref',
-    'foreign keys' => array(),
-    'indexes' => array(
-      'target_id' => array(
-        0 => 'target_id',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'entityreference',
-    'settings' => array(
-      'handler' => 'og',
-      'handler_settings' => array(
-        'behaviors' => array(
-          'og_behavior' => array(
-            'status' => TRUE,
-          ),
-        ),
-        'membership_type' => 'og_membership_type_default',
-        'target_bundles' => array(),
-      ),
-      'handler_submit' => 'Change handler',
-      'target_type' => 'node',
-    ),
-    'translatable' => 0,
-    'type' => 'entityreference',
-  );
-
-  return $field_bases;
-}
diff --git a/og_example/og_example.features.field_instance.inc b/og_example/og_example.features.field_instance.inc
deleted file mode 100644
index a059a51..0000000
--- a/og_example/og_example.features.field_instance.inc
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * @file
- * og_example.features.field_instance.inc
- */
-
-/**
- * Implements hook_field_default_field_instances().
- */
-function og_example_field_default_field_instances() {
-  $field_instances = array();
-
-  // Exported field_instance: 'message-og_new_content-field_node_reference'
-  $field_instances['message-og_new_content-field_node_reference'] = array(
-    'bundle' => 'og_new_content',
-    'default_value' => NULL,
-    'default_value_function' => '',
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'module' => 'entityreference',
-        'settings' => array(
-          'link' => FALSE,
-        ),
-        'type' => 'entityreference_label',
-        'weight' => 0,
-      ),
-      'message_notify_email_body' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-      'message_notify_email_subject' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-    ),
-    'entity_type' => 'message',
-    'field_name' => 'field_node_reference',
-    'label' => 'Node reference',
-    'required' => 0,
-    'settings' => array(
-      'behaviors' => array(
-        'prepopulate' => array(
-          'action' => 'none',
-          'fallback' => 'none',
-          'skip_perm' => 0,
-          'status' => 0,
-        ),
-      ),
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'active' => 1,
-      'module' => 'entityreference',
-      'settings' => array(
-        'match_operator' => 'CONTAINS',
-        'path' => '',
-        'size' => 60,
-      ),
-      'type' => 'entityreference_autocomplete',
-      'weight' => 1,
-    ),
-  );
-
-  // Exported field_instance: 'node-group-body'
-  $field_instances['node-group-body'] = array(
-    'bundle' => 'group',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'hidden',
-        'module' => 'text',
-        'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 1,
-      ),
-      'teaser' => array(
-        'label' => 'hidden',
-        'module' => 'text',
-        'settings' => array(
-          'trim_length' => 600,
-        ),
-        'type' => 'text_summary_or_trimmed',
-        'weight' => 1,
-      ),
-    ),
-    'entity_type' => 'node',
-    'field_name' => 'body',
-    'label' => 'Body',
-    'required' => FALSE,
-    'settings' => array(
-      'display_summary' => TRUE,
-      'text_processing' => 1,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'module' => 'text',
-      'settings' => array(
-        'rows' => 20,
-        'summary_rows' => 5,
-      ),
-      'type' => 'text_textarea_with_summary',
-      'weight' => 1,
-    ),
-    'widget_type' => 'text_textarea_with_summary',
-  );
-
-  // Exported field_instance: 'node-group-group_group'
-  $field_instances['node-group-group_group'] = array(
-    'bundle' => 'group',
-    'default_value' => array(
-      0 => array(
-        'value' => 1,
-      ),
-    ),
-    'deleted' => 0,
-    'description' => 'Determine if this is an OG group.',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'module' => 'og_ui',
-        'settings' => array(
-          'field_name' => FALSE,
-        ),
-        'type' => 'og_group_subscribe',
-        'weight' => 0,
-      ),
-      'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-    ),
-    'display_label' => 1,
-    'entity_type' => 'node',
-    'field_name' => 'group_group',
-    'label' => 'Group',
-    'required' => FALSE,
-    'settings' => array(
-      'user_register_form' => FALSE,
-    ),
-    'view modes' => array(
-      'full' => array(
-        'custom settings' => FALSE,
-        'label' => 'Full',
-        'type' => 'og_group_subscribe',
-      ),
-      'teaser' => array(
-        'custom settings' => FALSE,
-        'label' => 'Teaser',
-        'type' => 'og_group_subscribe',
-      ),
-    ),
-    'widget' => array(
-      'module' => 'options',
-      'settings' => array(
-        'display_label' => 0,
-        'og_hide' => TRUE,
-      ),
-      'type' => 'options_onoff',
-      'weight' => 0,
-    ),
-  );
-
-  // Exported field_instance: 'node-post-body'
-  $field_instances['node-post-body'] = array(
-    'bundle' => 'post',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'hidden',
-        'module' => 'text',
-        'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 1,
-      ),
-      'teaser' => array(
-        'label' => 'hidden',
-        'module' => 'text',
-        'settings' => array(
-          'trim_length' => 600,
-        ),
-        'type' => 'text_summary_or_trimmed',
-        'weight' => 1,
-      ),
-    ),
-    'entity_type' => 'node',
-    'field_name' => 'body',
-    'label' => 'Body',
-    'required' => FALSE,
-    'settings' => array(
-      'display_summary' => TRUE,
-      'text_processing' => 1,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'module' => 'text',
-      'settings' => array(
-        'rows' => 20,
-        'summary_rows' => 5,
-      ),
-      'type' => 'text_textarea_with_summary',
-      'weight' => 1,
-    ),
-    'widget_type' => 'text_textarea_with_summary',
-  );
-
-  // Exported field_instance: 'node-post-og_group_ref'
-  $field_instances['node-post-og_group_ref'] = array(
-    'bundle' => 'post',
-    'default_value' => NULL,
-    'default_value_function' => 'entityreference_prepopulate_field_default_value',
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'module' => 'og_ui',
-        'settings' => array(),
-        'type' => 'og_list_default',
-        'weight' => 1,
-      ),
-      'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-    ),
-    'entity_type' => 'node',
-    'field_name' => 'og_group_ref',
-    'label' => 'Groups audience',
-    'required' => FALSE,
-    'settings' => array(
-      'behaviors' => array(
-        'og_widget' => array(
-          'admin' => array(
-            'widget_type' => 'entityreference_autocomplete',
-          ),
-          'default' => array(
-            'widget_type' => 'options_select',
-          ),
-          'status' => TRUE,
-        ),
-        'prepopulate' => array(
-          'action' => 'none',
-          'fallback' => 'none',
-          'skip_perm' => FALSE,
-          'status' => TRUE,
-        ),
-      ),
-      'user_register_form' => FALSE,
-    ),
-    'view modes' => array(
-      'full' => array(
-        'custom settings' => FALSE,
-        'label' => 'Full',
-        'type' => 'og_list_default',
-      ),
-      'teaser' => array(
-        'custom settings' => FALSE,
-        'label' => 'Teaser',
-        'type' => 'og_list_default',
-      ),
-    ),
-    'widget' => array(
-      'module' => 'og',
-      'settings' => array(),
-      'type' => 'og_complex',
-      'weight' => 1,
-    ),
-  );
-
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Body');
-  t('Determine if this is an OG group.');
-  t('Group');
-  t('Groups audience');
-  t('Node reference');
-
-  return $field_instances;
-}
diff --git a/og_example/og_example.features.inc b/og_example/og_example.features.inc
deleted file mode 100644
index 47adfe7..0000000
--- a/og_example/og_example.features.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * @file
- * og_example.features.inc
- */
-
-/**
- * Implements hook_ctools_plugin_api().
- */
-function og_example_ctools_plugin_api($module = NULL, $api = NULL) {
-  if ($module == "page_manager" && $api == "pages_default") {
-    return array("version" => "1");
-  }
-}
-
-/**
- * Implements hook_default_message_type().
- */
-function og_example_default_message_type() {
-  $items = array();
-  $items['og_new_content'] = entity_import('message_type', '{
-    "name" : "og_new_content",
-    "description" : "OG new content",
-    "argument_keys" : [],
-    "argument" : [],
-    "category" : "message_type",
-    "data" : {
-      "token options" : { "clear" : 0 },
-      "purge" : { "override" : 0, "enabled" : 0, "quota" : "", "days" : "" }
-    },
-    "language" : "",
-    "arguments" : null,
-    "message_text" : { "und" : [
-        {
-          "value" : "New post in group -- [message:field-node-reference:title]",
-          "format" : "full_html",
-          "safe_value" : "\\u003Cp\\u003ENew post in group -- [message:field-node-reference:title]\\u003C\\/p\\u003E\\n"
-        },
-        {
-          "value" : "Hello [message:user:name],\\r\\n\\r\\nThere is a new post called \\u003Ca href=\\u0022[message:field-node-reference:url]\\u0022\\u003E[message:field-node-reference:title]\\u003C\\/a\\u003E that belongs to one of the groups you are subscribed to.\\r\\n\\r\\nCheers,\\r\\n[site:name]",
-          "format" : "full_html",
-          "safe_value" : "\\u003Cp\\u003EHello [message:user:name],\\u003C\\/p\\u003E\\n\\u003Cp\\u003EThere is a new post called \\u003Ca href=\\u0022[message:field-node-reference:url]\\u0022\\u003E[message:field-node-reference:title]\\u003C\\/a\\u003E that belongs to one of the groups you are subscribed to.\\u003C\\/p\\u003E\\n\\u003Cp\\u003ECheers,\\u003Cbr \\/\\u003E\\n[site:name]\\u003C\\/p\\u003E\\n"
-        }
-      ]
-    },
-    "rdf_mapping" : []
-  }');
-  return $items;
-}
-
-/**
- * Implements hook_node_info().
- */
-function og_example_node_info() {
-  $items = array(
-    'group' => array(
-      'name' => t('Group'),
-      'base' => 'node_content',
-      'description' => t('The group that will have members and content associated with.'),
-      'has_title' => '1',
-      'title_label' => t('Title'),
-      'help' => '',
-    ),
-    'post' => array(
-      'name' => t('Post'),
-      'base' => 'node_content',
-      'description' => t('Content that will belong to a single or multiple groups.'),
-      'has_title' => '1',
-      'title_label' => t('Title'),
-      'help' => '',
-    ),
-  );
-  return $items;
-}
diff --git a/og_example/og_example.info b/og_example/og_example.info
deleted file mode 100644
index 72f83d3..0000000
--- a/og_example/og_example.info
+++ /dev/null
@@ -1,38 +0,0 @@
-name = OG example
-description = Example module to show Organic groups configuration that can be used as building block.
-core = 7.x
-package = Features
-dependencies[] = ctools
-dependencies[] = entityreference_prepopulate
-dependencies[] = features
-dependencies[] = list
-dependencies[] = message_notify
-dependencies[] = og
-dependencies[] = og_ui
-dependencies[] = page_manager
-dependencies[] = panels
-dependencies[] = rules
-dependencies[] = views_content
-features[ctools][] = page_manager:pages_default:1
-features[features_api][] = api:2
-features[field_base][] = body
-features[field_base][] = field_node_reference
-features[field_base][] = group_group
-features[field_base][] = og_group_ref
-features[field_instance][] = message-og_new_content-field_node_reference
-features[field_instance][] = node-group-body
-features[field_instance][] = node-group-group_group
-features[field_instance][] = node-post-body
-features[field_instance][] = node-post-og_group_ref
-features[message_type][] = og_new_content
-features[node][] = group
-features[node][] = post
-features[page_manager_handlers][] = node_view_panel_context
-features[rules_config][] = rules_og_new_content_message
-
-; Information added by Drupal.org packaging script on 2016-04-20
-version = "7.x-2.9"
-core = "7.x"
-project = "og"
-datestamp = "1461150274"
-
diff --git a/og_example/og_example.install b/og_example/og_example.install
deleted file mode 100644
index 41f682c..0000000
--- a/og_example/og_example.install
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update, and uninstall functions for the OG example module.
- */
-
-/**
- * Implements hook_enable().
- *
- * Add group audience fields to "Post" node type.
- */
-function og_example_enable() {
-  $og_field = og_fields_info(OG_AUDIENCE_FIELD);
-  $og_field['field']['settings']['target_type'] = 'node';
-
-  // Enable Entity reference prepopulate.
-  $og_field['instance']['settings']['behaviors']['prepopulate'] = array(
-    'status' => TRUE,
-    'action' => 'none',
-    'fallback' => 'none',
-    'skip_perm' => FALSE,
-  );
-  og_create_field(OG_AUDIENCE_FIELD, 'node', 'post', $og_field);
-}
diff --git a/og_example/og_example.module b/og_example/og_example.module
deleted file mode 100644
index 09d1fa9..0000000
--- a/og_example/og_example.module
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-include_once('og_example.features.inc');
-
-/**
- * Implements hook_ctools_plugin_directory().
- */
-function og_example_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'entityreference') {
-    return "plugins/entityreference/$plugin";
-  }
-}
-
-/**
- * Implements hook_default_rules_configuration_alter().
- *
- * Remove OG's default notification Rules, as this modules has a superior
- * version of it, that uses Message notify.
- */
-function og_example_default_rules_configuration_alter(&$configs) {
-  unset($configs['rules_og_new_content']);
-}
diff --git a/og_example/og_example.pages_default.inc b/og_example/og_example.pages_default.inc
deleted file mode 100644
index ae6f395..0000000
--- a/og_example/og_example.pages_default.inc
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * @file
- * og_example.pages_default.inc
- */
-
-/**
- * Implements hook_default_page_manager_handlers().
- */
-function og_example_default_page_manager_handlers() {
-  $export = array();
-
-  $handler = new stdClass();
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'node_view_panel_context';
-  $handler->task = 'node_view';
-  $handler->subtask = '';
-  $handler->handler = 'panel_context';
-  $handler->weight = 0;
-  $handler->conf = array(
-    'title' => 'Group',
-    'no_blocks' => 0,
-    'pipeline' => 'standard',
-    'css_id' => '',
-    'css' => '',
-    'contexts' => array(),
-    'relationships' => array(),
-    'access' => array(
-      'plugins' => array(
-        0 => array(
-          'name' => 'og_is_node_group',
-          'settings' => array(
-            'is_group_content' => '1',
-          ),
-          'context' => 'argument_entity_id:node_1',
-          'not' => FALSE,
-        ),
-      ),
-      'logic' => 'and',
-    ),
-  );
-  $display = new panels_display();
-  $display->layout = 'twocol_stacked';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
-    'style_settings' => array(
-      'default' => NULL,
-      'top' => NULL,
-      'left' => NULL,
-      'right' => NULL,
-      'bottom' => NULL,
-    ),
-  );
-  $display->cache = array();
-  $display->title = '';
-  $display->content = array();
-  $display->panels = array();
-    $pane = new stdClass();
-    $pane->pid = 'new-1';
-    $pane->panel = 'left';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'og_nodes-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => array(
-        0 => 'argument_entity_id:node_1',
-      ),
-      'override_title' => 1,
-      'override_title_text' => 'Group articles',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = '';
-    $display->content['new-1'] = $pane;
-    $display->panels['left'][0] = 'new-1';
-    $pane = new stdClass();
-    $pane->pid = 'new-2';
-    $pane->panel = 'right';
-    $pane->type = 'node_create_links';
-    $pane->subtype = 'node_create_links';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-      'field_name' => 'og_group_ref',
-      'types' => array(),
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = '';
-    $display->content['new-2'] = $pane;
-    $display->panels['right'][0] = 'new-2';
-    $pane = new stdClass();
-    $pane->pid = 'new-3';
-    $pane->panel = 'right';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'og_members-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => array(
-        0 => 'argument_entity_id:node_1',
-      ),
-      'override_title' => 0,
-      'override_title_text' => 'Members',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = '';
-    $display->content['new-3'] = $pane;
-    $display->panels['right'][1] = 'new-3';
-    $pane = new stdClass();
-    $pane->pid = 'new-4';
-    $pane->panel = 'right';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:group_group';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'title',
-      'formatter' => 'og_group_subscribe',
-      'formatter_settings' => array(
-        'field_name' => 'og_user_group_ref',
-      ),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 1,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 2;
-    $pane->locks = '';
-    $display->content['new-4'] = $pane;
-    $display->panels['right'][2] = 'new-4';
-    $pane = new stdClass();
-    $pane->pid = 'new-5';
-    $pane->panel = 'top';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:body';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => '',
-      'formatter' => 'text_default',
-      'formatter_settings' => array(),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 1,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = '';
-    $display->content['new-5'] = $pane;
-    $display->panels['top'][0] = 'new-5';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = '0';
-  $handler->conf['display'] = $display;
-  $export['node_view_panel_context'] = $handler;
-
-  return $export;
-}
diff --git a/og_example/og_example.rules_defaults.inc b/og_example/og_example.rules_defaults.inc
deleted file mode 100644
index d93dca9..0000000
--- a/og_example/og_example.rules_defaults.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @file
- * og_example.rules_defaults.inc
- */
-
-/**
- * Implements hook_default_rules_configuration().
- */
-function og_example_default_rules_configuration() {
-  $items = array();
-  $items['rules_og_new_content_message'] = entity_import('rules_config', '{ "rules_og_new_content_message" : {
-      "LABEL" : "OG new content notification (With Message)",
-      "PLUGIN" : "reaction rule",
-      "OWNER" : "rules",
-      "REQUIRES" : [ "og", "rules", "message_notify" ],
-      "ON" : { "node_insert" : [] },
-      "IF" : [ { "og_entity_is_group_content" : { "entity" : [ "node" ] } } ],
-      "DO" : [
-        { "og_get_members" : {
-            "USING" : { "group_content" : [ "node" ] },
-            "PROVIDE" : { "group_members" : { "group_members" : "List of group members" } }
-          }
-        },
-        { "LOOP" : {
-            "USING" : { "list" : [ "group-members" ] },
-            "ITEM" : { "list_item" : "Current list item" },
-            "DO" : [
-              { "entity_create" : {
-                  "USING" : {
-                    "type" : "message",
-                    "param_type" : "og_new_content",
-                    "param_user" : [ "list-item" ]
-                  },
-                  "PROVIDE" : { "entity_created" : { "entity_created" : "Message entity" } }
-                }
-              },
-              { "data_set" : {
-                  "data" : [ "entity-created:field-node-reference" ],
-                  "value" : [ "node" ]
-                }
-              },
-              { "entity_save" : { "data" : [ "entity-created" ], "immediate" : 1 } },
-              { "message_notify_process" : {
-                  "message" : [ "entity-created" ],
-                  "save_on_fail" : 0,
-                  "save_on_success" : 0
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  }');
-  return $items;
-}
\ No newline at end of file
diff --git a/og_example/plugins/entityreference/selection/OgExampleSelectionHandler.class.php b/og_example/plugins/entityreference/selection/OgExampleSelectionHandler.class.php
deleted file mode 100644
index 52ac0dd..0000000
--- a/og_example/plugins/entityreference/selection/OgExampleSelectionHandler.class.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-
-/**
- * @file
- * OG example selection handler.
- */
-
-class OgExampleSelectionHandler extends OgSelectionHandler {
-
-  /**
-   * Overrides OgSelectionHandler::getInstance().
-   */
-  public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) {
-    return new OgExampleSelectionHandler($field, $instance, $entity_type, $entity);
-  }
-
-  /**
-   * Overrides OgSelectionHandler::buildEntityFieldQuery().
-   *
-   * This is an example of "subgroups" (but without getting into the logic of
-   * sub-grouping).
-   * The idea here is to show we can set "My groups" and "Other groups" to
-   * reference different groups by different
-   * logic. In this example, all group nodes below node ID 5, will appear under
-   * "My groups", and the rest will appear under "Other groups",
-   * for administrators.
-   */
-  public function buildEntityFieldQuery($match = NULL, $match_operator = 'CONTAINS') {
-    $group_type = $this->field['settings']['target_type'];
-
-
-    if (empty($this->instance['field_mode']) || $group_type != 'node') {
-      return parent::buildEntityFieldQuery($match, $match_operator);
-    }
-
-    $field_mode = $this->instance['field_mode'];
-    $handler = EntityReference_SelectionHandler_Generic::getInstance($this->field, $this->instance, $this->entity_type, $this->entity);
-    $query = $handler->buildEntityFieldQuery($match, $match_operator);
-
-    // Show only the entities that are active groups.
-    $query->fieldCondition(OG_GROUP_FIELD, 'value', 1, '=');
-
-    if ($field_mode == 'default') {
-      $query->propertyCondition('nid', '5', '<=');
-    }
-    else {
-      $query->propertyCondition('nid', '5', '>');
-    }
-
-    // FIXME: http://drupal.org/node/1325628
-    unset($query->tags['node_access']);
-
-    // FIXME: drupal.org/node/1413108
-    unset($query->tags['entityreference']);
-
-    $query->addTag('entity_field_access');
-    $query->addTag('og');
-
-    return $query;
-  }
-}
diff --git a/og_example/plugins/entityreference/selection/og_example.inc b/og_example/plugins/entityreference/selection/og_example.inc
deleted file mode 100644
index 5f6e37c..0000000
--- a/og_example/plugins/entityreference/selection/og_example.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$plugin = array(
-  'title' => t('Organic groups example'),
-  'class' => 'OgExampleSelectionHandler',
-);
-