diff --git a/db.class.php b/db.class.php
index 24a61f3..538e593 100644
--- a/db.class.php
+++ b/db.class.php
@@ -723,7 +723,6 @@ class MeekroDB {
     return $return;
   }
 
-  public function queryOneRow() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstRow'), $args); }
   public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
@@ -731,7 +730,6 @@ class MeekroDB {
     return reset($result);
   }
 
-  public function queryOneList() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstList'), $args); }
   public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
@@ -753,46 +751,12 @@ class MeekroDB {
     return $ret;
   }
   
-  public function queryOneColumn() {
-    $args = func_get_args();
-    $column = array_shift($args);
-    $results = call_user_func_array(array($this, 'query'), $args);
-    $ret = array();
-    
-    if (!count($results) || !count($results[0])) return $ret;
-    if ($column === null) {
-      $keys = array_keys($results[0]);
-      $column = $keys[0];
-    }
-    
-    foreach ($results as $row) {
-      $ret[] = $row[$column];
-    }
-    
-    return $ret;
-  }
-  
   public function queryFirstField() { 
     $args = func_get_args();
     $row = call_user_func_array(array($this, 'queryFirstList'), $args);
     if ($row == null) return null;    
     return $row[0];
   }
-  
-  public function queryOneField() {
-    $args = func_get_args();
-    $column = array_shift($args);
-    
-    $row = call_user_func_array(array($this, 'queryOneRow'), $args);
-    if ($row == null) { 
-      return null;
-    } else if ($column === null) {
-      $keys = array_keys($row);
-      $column = $keys[0];
-    }  
-    
-    return $row[$column];
-  }
 }
 
 class WhereClause {
diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index 02fb98c..386f71b 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -44,14 +44,8 @@ class BasicTest extends SimpleTest {
     $field = DB::queryFirstField("SELECT * FROM accounts");
     $this->assert($field === null);
     
-    $field = DB::queryOneField('nothere', "SELECT * FROM accounts");
-    $this->assert($field === null);
-    
     $column = DB::queryFirstColumn("SELECT * FROM accounts");
     $this->assert(is_array($column) && count($column) === 0);
-    
-    $column = DB::queryOneColumn('nothere', "SELECT * FROM accounts"); //TODO: is this what we want?
-    $this->assert(is_array($column) && count($column) === 0);
   }
   
   function test_2_insert_row() {
@@ -117,16 +111,12 @@ class BasicTest extends SimpleTest {
       array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
     $this->assert($charlie_password === 'goodbye');
     
-    $charlie_password = DB::queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s", 
-      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
-    $this->assert($charlie_password === 'goodbye');
-    
     $passwords = DB::queryFirstColumn("SELECT password FROM accounts WHERE username=%s", 'Bart');
     $this->assert(count($passwords) === 1);
     $this->assert($passwords[0] === 'hello');
     
     $username = $password = $age = null;
-    list($age, $username, $password) = DB::queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    list($age, $username, $password) = DB::queryFirstList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
     $this->assert($username === 'Bart');
     $this->assert($password === 'hello');
     $this->assert($age == 15);
@@ -176,7 +166,7 @@ class BasicTest extends SimpleTest {
       'height' => 111.15
     ));
     
-    $row = DB::queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $row = DB::queryFirstRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
     $this->assert($row['username'] === 'newguy');
     $this->assert($row['age'] === '172');
     
@@ -186,7 +176,7 @@ class BasicTest extends SimpleTest {
       ), 'username=%s_name', array('name' => 'newguy'));
     
     $row = null;
-    $row = DB::queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $row = DB::queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
     $this->assert($true === true);
     $this->assert($row['password'] === 'blahblahblahblah');
     $this->assert($row['favorite_word'] === null);
@@ -260,7 +250,7 @@ class BasicTest extends SimpleTest {
     $this->assert($rows[1]['password'] === 'somethingelse');
     $this->assert($rows[1]['username'] === '2ofmany');
     
-    $nullrow = DB::queryOneRow("SELECT * FROM accounts WHERE username LIKE %ss", '3ofman');
+    $nullrow = DB::queryFirstRow("SELECT * FROM accounts WHERE username LIKE %ss", '3ofman');
     $this->assert($nullrow['password'] === NULL);
     $this->assert($nullrow['age'] === '15');
   }
@@ -282,7 +272,7 @@ class BasicTest extends SimpleTest {
     DB::insert('store data', array(
       'picture' => $smile,
     ));
-    DB::queryOneRow("INSERT INTO %b (picture) VALUES (%s)", 'store data', $smile);
+    DB::queryFirstRow("INSERT INTO %b (picture) VALUES (%s)", 'store data', $smile);
     
     $getsmile = DB::queryFirstField("SELECT picture FROM %b WHERE id=1", 'store data');
     $getsmile2 = DB::queryFirstField("SELECT picture FROM %b WHERE id=2", 'store data');
diff --git a/simpletest/ObjectTest.php b/simpletest/ObjectTest.php
index 6f7b61e..df12c46 100644
--- a/simpletest/ObjectTest.php
+++ b/simpletest/ObjectTest.php
@@ -32,14 +32,8 @@ class ObjectTest extends SimpleTest {
     $field = $this->mdb->queryFirstField("SELECT * FROM accounts");
     $this->assert($field === null);
     
-    $field = $this->mdb->queryOneField('nothere', "SELECT * FROM accounts");
-    $this->assert($field === null);
-    
     $column = $this->mdb->queryFirstColumn("SELECT * FROM accounts");
     $this->assert(is_array($column) && count($column) === 0);
-    
-    $column = $this->mdb->queryOneColumn('nothere', "SELECT * FROM accounts"); //TODO: is this what we want?
-    $this->assert(is_array($column) && count($column) === 0);
   }
   
   function test_2_insert_row() {
@@ -88,16 +82,12 @@ class ObjectTest extends SimpleTest {
       array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
     $this->assert($charlie_password === 'goodbye');
     
-    $charlie_password = $this->mdb->queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s", 
-      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
-    $this->assert($charlie_password === 'goodbye');
-    
     $passwords = $this->mdb->queryFirstColumn("SELECT password FROM accounts WHERE username=%s", 'Bart');
     $this->assert(count($passwords) === 1);
     $this->assert($passwords[0] === 'hello');
     
     $username = $password = $age = null;
-    list($age, $username, $password) = $this->mdb->queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    list($age, $username, $password) = $this->mdb->queryFirstList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
     $this->assert($username === 'Bart');
     $this->assert($password === 'hello');
     $this->assert($age == 15);
@@ -142,7 +132,7 @@ class ObjectTest extends SimpleTest {
       'height' => 111.15
     ));
     
-    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $row = $this->mdb->queryFirstRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
     $this->assert($row['username'] === 'newguy');
     $this->assert($row['age'] === '172');
     
@@ -152,7 +142,7 @@ class ObjectTest extends SimpleTest {
       ), 'username=%s', 'newguy');
     
     $row = null;
-    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $row = $this->mdb->queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
     $this->assert($row['password'] === 'blahblahblahblah');
     $this->assert($row['favorite_word'] === null);