diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 8bf152b16e..a1eef49cee 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -645,11 +645,6 @@ function checked( $checked, $current) {
 		echo ' checked="checked"';
 }
 
-function return_categories_list( $parent = 0 ) {
-	global $wpdb;
-	return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( link_count = 0 OR category_count != 0 ) ORDER BY category_count DESC" );
-}
-
 function sort_cats( $cat1, $cat2 ) {
 	if ( $cat1['checked'] || $cat2['checked'] )
 		return ( $cat1['checked'] && !$cat2['checked'] ) ? -1 : 1;
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 369d80efaa..f1325d36a9 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -650,7 +650,8 @@ function clean_page_cache($id) {
 
 function update_post_category_cache($post_ids) {
 	global $wpdb, $category_cache, $tag_cache, $blog_id;
-
+	// TODO
+	return;
 	if ( empty($post_ids) )
 		return;
 
diff --git a/xmlrpc.php b/xmlrpc.php
index 190695dd3e..2c4f5ad013 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -1560,10 +1560,10 @@ class wp_xmlrpc_server extends IXR_Server {
 		$categories_struct = array();
 
 		// FIXME: can we avoid using direct SQL there?
-		if ($cats = $wpdb->get_results("SELECT cat_ID, cat_name FROM $wpdb->categories WHERE (type & " . TAXONOMY_CATEGORY . " != 0)", ARRAY_A)) {
+		if ( $cats = get_categories('hide_empty=0&hierarchical=0') ) {
 			foreach ($cats as $cat) {
-				$struct['categoryId'] = $cat['cat_ID'];
-				$struct['categoryName'] = $cat['cat_name'];
+				$struct['categoryId'] = $cat->term_id;
+				$struct['categoryName'] = $cat->name;
 
 				$categories_struct[] = $struct;
 			}