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..fcf85d5 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,9 @@ 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',