--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -1,88 +1,31 @@
 <?php
 
-include $basePath."schemas/schemas.inc.php";
+include $basePath . "schemas/schemas.inc.php";
 
-require ($basePath.'couchdb/settee/src/settee.php');
+require ($basePath . 'couchdb/settee/src/settee.php');
 
-function createAgencyDesignDoc() {
-    global $db;
-    $obj = new stdClass();
-    $obj->_id = "_design/" . urlencode("app");
-    $obj->language = "javascript";
-    $obj->views->all->map = "function(doc) {   emit(doc._id, doc); };";
-    $obj->views->byABN->map = "function(doc) {   emit(doc.abn, doc); };";
-        $obj->views->byCanonicalName->map = "function(doc) {  
-            if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') {
-        emit(doc.name, doc); 
+if (php_uname('n') == "vanille") {
+    $serverAddr = 'http://192.168.178.21:5984/';
+} else
+    if (php_uname('n') == "KYUUBEY") {
+
+        $serverAddr = 'http://192.168.1.148:5984/';
+        $serverAddr = 'http://127.0.0.1:5984/';
+    } else
+        if (php_uname('n') == "ikurt-20") {
+
+            //$serverAddr = 'http://192.168.1.113:5984/';
+            $serverAddr = 'http://127.0.0.1:5984/';
+        } else {
+            $serverAddr = 'http://127.0.0.1:5984/';
         }
-};";
-        $obj->views->byDeptStateName->map = "function(doc) {  
-            if (doc.orgType == 'FMA-DepartmentOfState') {
-        emit(doc.name, doc._id); 
-        }
-};";
-        $obj->views->parentOrgs->map = "function(doc) {
-            if (doc.parentOrg) {
-        emit(doc._id, doc.parentOrg);
-        }
-};";
-    $obj->views->byName->map = "function(doc) {  
-        emit(doc.name, doc._id); 
- for (name in doc.otherNames) {
-if (doc.otherNames[name] != '' && doc.otherNames[name] != doc.name) {
-       	 emit(doc.otherNames[name], doc._id); 
-}
-        }
-};";
-    
-   $obj->views->foiEmails->map = "function(doc) {  
-        emit(doc._id, doc.foiEmail);
-};";
-    
-    $obj->views->byLastModified->map = "function(doc) {   emit(doc.metadata.lastModified, doc); }";
-    $obj->views->getActive->map = 'function(doc) { if (doc.status == "active") {  emit(doc._id, doc); } };';
-    $obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") {  emit(doc._id, doc); } };';
-    $obj->views->getScrapeRequired->map = "function(doc) {   emit(doc.abn, doc); };";
-    $obj->views->showNamesABNs->map = "function(doc) {   emit(doc._id, {name: doc.name, abn: doc.abn}); };";
-    $obj->views->getConflicts->map = "function(doc) {
-  if (doc._conflicts) {
-    emit(null, [doc._rev].concat(doc._conflicts));
-  }
-}";
-    // http://stackoverflow.com/questions/646628/javascript-startswith
-    $obj->views->score->map = 'if(!String.prototype.startsWith){
-    String.prototype.startsWith = function (str) {
-        return !this.indexOf(str);
+$server = new SetteeServer($serverAddr);
+
+function setteErrorHandler($e)
+{
+    if (class_exists('Amon')) {
+        Amon::log($e->getMessage() . " " . print_r($_SERVER, true), array('error'));
     }
+    echo $e->getMessage() . "<br>" . PHP_EOL;
 }
 
-function(doc) {
-count = 0;
-if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") {
-for(var propName in doc) {
-      if(typeof(doc[propName]) != "undefined" && propName.startsWith("l")) {
-  	count++
-	}
-}
-  emit(count+doc._id, {id:doc._id, name: doc.name, score:count});
-  }
-}';
-
-    // allow safe updates (even if slightly slower due to extra: rev-detection check).
-    return $db->save($obj, true);
-}
-
-
-if( php_uname('n') == "vanille") {
-
-$server = new SetteeServer('http://192.168.178.21:5984');
-} else 
-    if( php_uname('n') == "KYUUBEY") {
-
-$server = new SetteeServer('http://192.168.1.148:5984');
-} else {
-    $server = new SetteeServer('http://127.0.0.1:5984');
-}
-function setteErrorHandler($e) {
-    echo $e->getMessage() . "<br>" . PHP_EOL;
-}