diff --git a/cod_schedule/plugins/content_types/cod_schedule_scheduler_pane.inc b/cod_schedule/plugins/content_types/cod_schedule_scheduler_pane.inc
index 0eb89b0..568a8e7 100644
--- a/cod_schedule/plugins/content_types/cod_schedule_scheduler_pane.inc
+++ b/cod_schedule/plugins/content_types/cod_schedule_scheduler_pane.inc
@@ -44,10 +44,12 @@ function cod_schedule_schedule_admin_page($conference, $day) {
   if (empty($rooms)) {
     return t('You must add a room to view the schedule.');
   }
+  // Check to see what content types contain field_session_timeslot.
+  $scheduable_types = field_info_field('field_session_timeslot')['bundles']['node'];
 
   $session_query = new EntityFieldQueryExtraFields();
   $sessions = $session_query->entityCondition('entity_type', 'node')
-    ->entityCondition('bundle', array('session', 'bof_session', 'schedule_item'), 'IN')
+    ->entityCondition('bundle', $scheduable_types, 'IN')
     ->fieldCondition('og_group_ref', 'target_id', $conference->nid)
     ->addExtraField('', 'title', 'title', 'node')
     ->execute();
diff --git a/cod_schedule/plugins/content_types/cod_schedule_sessions_pane.inc b/cod_schedule/plugins/content_types/cod_schedule_sessions_pane.inc
index 99621e0..995eaf7 100644
--- a/cod_schedule/plugins/content_types/cod_schedule_sessions_pane.inc
+++ b/cod_schedule/plugins/content_types/cod_schedule_sessions_pane.inc
@@ -32,18 +32,8 @@ function cod_schedule_sessions_admin_page($node) {
       'id' => 'schedule-items-type-select',
     ),
   );
-  // TODO: In drupal8 we'll not do something bad like this
-  if (module_exists('cod_session')) {
-    $content['type_selector']['#options']['session'] = t('Session');
-    $content['type_selector']['#options']['schedule_item'] = t('Schedule Item');
-    $content['type_selector']['#default_value'] = 'session';
-  }
-  if (module_exists('cod_bof')) {
-    $content['type_selector']['#options']['bof_session'] = t('BoF Session');
-  }
-  if (module_exists('cod_training')) {
-    $content['type_selector']['#options']['training'] = t('Training');
-  }
+  // Check to see what content types contain field_session_timeslot and grab their human readable names, and put them into the dropdown.
+  $content['type_selector']['#options'] = array_intersect_key(node_type_get_names(), array_flip(field_info_field('field_session_timeslot')['bundles']['node']));
 
   $content['add_new'] = array(
     '#type' => 'button',
diff --git a/cod_session/modules/cod_session_evaluations/cod_session_evaluations.module b/cod_session/modules/cod_session_evaluations/cod_session_evaluations.module
index fbe2dae..2216597 100644
--- a/cod_session/modules/cod_session_evaluations/cod_session_evaluations.module
+++ b/cod_session/modules/cod_session_evaluations/cod_session_evaluations.module
@@ -44,10 +44,11 @@ function cod_session_evaluations_form_session_evaluation_node_form_alter(&$form,
 * Implements hook_node_view().
 */
 function cod_session_evaluations_node_view($node, $view_mode, $langcode) {
-  //sanity check -- we should only be posting on the session nodes. Return if its any other node or listing
+  // Only be posting on schedulable nodes. Return if it’s any other node or
+  // listing.
   //todo -- probably want to be able add the link for a listing of nodes, but we can't at the moment
   //        since entities aren't loaded on anything but the full view
-  if(($node->type != 'session' && $node->type != 'schedule_item') || $view_mode != 'full') {
+  if (!in_array($node->type, field_info_field('field_session_timeslot')['bundles']['node']) || $view_mode != 'full') {
     return;
   }
   unset($node->content['links']['comment']);