diff --git a/role_help.module b/role_help.module
index 2db2b19..b8c782d 100644
--- a/role_help.module
+++ b/role_help.module
@@ -249,21 +249,10 @@ function role_help_theme() {
         'description' => NULL,
       ),
     ),
-    'role_name' => array(
-      'arguments' => array('name' => NULL, 'rid' => NULL),
-    ),
   );
 }
 
 /**
- * Implementation of hook_theme_registry_alter().
- */
-function role_help_theme_registry_alter(&$theme_registry) {
-  // Override to provide our extras to the role list admin page.
-  $theme_registry['user_admin_new_role']['function'] = 'role_help_user_admin_new_role';
-}
-
-/**
  * Theme a role help section.
  *
  * @param $name
@@ -276,54 +265,3 @@ function theme_role_help_section($name, $description) {
   $output .= '<div>' . check_markup($description, variable_get('role_help_format', FILTER_FORMAT_DEFAULT), FALSE) . '</div>';
   return $output;
 }
-
-/**
- * Theme the new-role form.
- *
- * Override of theme_user_admin_new_role() to add theme('role_name').
- *
- * @ingroup themeable
- */
-function role_help_user_admin_new_role($form) {
-  $header = array(t('Name'), array(
-      'data' => t('Operations'),
-      'colspan' => 2,
-    ));
-  foreach (user_roles() as $rid => $name) {
-    $edit_permissions = l(t('edit permissions'), 'admin/user/permissions/' . $rid);
-    if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-      $rows[] = array(theme('role_name', $name, $rid), l(t('edit role'), 'admin/user/roles/edit/' . $rid), $edit_permissions);
-    }
-    else {
-      $rows[] = array($name, t('locked'), $edit_permissions);
-    }
-    if (!empty($summary)) {
-      $rows[] = array($summary);
-    }
-  }
-  $rows[] = array(drupal_render($form['name']), array(
-      'data' => drupal_render($form['submit']),
-      'colspan' => 2,
-    ));
-
-  $output = drupal_render($form);
-  $output .= theme('table', $header, $rows);
-
-  return $output;
-}
-
-/**
- * Add role summary to role name.
- *
- * @param $name
- *   Role name
- * @param $rid
- *   Role id
- *
- * @ingroup themeable
- */
-function theme_role_name($name, $rid = NULL) {
-  // @todo: fix so this query isn't run once for each role!
-  $summary = db_result(db_query("SELECT summary FROM {role_help} d WHERE d.rid = :rid", array(':rid' => $rid)));
-  return '<div class="role-name">' . check_plain($name) . '</div>' . theme('placeholder', $summary);
-}