diff --git a/lib/jsonrpc.js b/lib/jsonrpc.js
index 510467d..10bd0ac 100644
--- a/lib/jsonrpc.js
+++ b/lib/jsonrpc.js
@@ -1,12 +1,5 @@
-var util = require('util');
 var http = require('http');
-var METHOD_NOT_ALLOWED = "Method Not Allowed\n";
-var INVALID_REQUEST = "Invalid Request\n";
 
-
-//===----------------------------------------------------------------------===//
-// Server Client
-//===----------------------------------------------------------------------===//
 var Client = function(port, host, user, password) {
   this.port = port;
   this.host = host;
@@ -124,170 +117,4 @@ Client.prototype.call = function(method, params, callback, errback, path) {
   request.end(requestJSON);
 };
 
-//===----------------------------------------------------------------------===//
-// Server
-//===----------------------------------------------------------------------===//
-function Server() {
-  var self = this;
-  this.functions = {};
-  this.server = http.createServer(function(req, res) {
-    Server.trace('<--', 'accepted request');
-    if(req.method === 'POST') {
-      self.handlePOST(req, res);
-    }
-    else {
-      Server.handleNonPOST(req, res);
-    }
-  });
-}
-
-
-//===----------------------------------------------------------------------===//
-// exposeModule
-//===----------------------------------------------------------------------===//
-Server.prototype.exposeModule = function(mod, object) {
-  var funcs = [];
-  for(var funcName in object) {
-    var funcObj = object[funcName];
-    if(typeof(funcObj) == 'function') {
-      this.functions[mod + '.' + funcName] = funcObj;
-      funcs.push(funcName);
-    }
-  }
-  Server.trace('***', 'exposing module: ' + mod + ' [funs: ' + funcs.join(', ')
-                + ']');
-  return object;
-}
-
-
-//===----------------------------------------------------------------------===//
-// expose
-//===----------------------------------------------------------------------===//
-Server.prototype.expose = function(name, func) {
-  Server.trace('***', 'exposing: ' + name);
-  this.functions[name] = func;
-}
-
-
-//===----------------------------------------------------------------------===//
-// trace
-//===----------------------------------------------------------------------===//
-Server.trace = function(direction, message) {
-  util.puts('   ' + direction + '   ' + message);
-}
-
-
-//===----------------------------------------------------------------------===//
-// listen
-//===----------------------------------------------------------------------===//
-Server.prototype.listen = function(port, host) {
-  this.server.listen(port, host);
-  Server.trace('***', 'Server listening on http://' + (host || '127.0.0.1') +
-                ':' + port + '/');
-}
-
-
-//===----------------------------------------------------------------------===//
-// handleInvalidRequest
-//===----------------------------------------------------------------------===//
-Server.handleInvalidRequest = function(req, res) {
-  res.writeHead(400, {'Content-Type': 'text/plain',
-                      'Content-Length': INVALID_REQUEST.length});
-  res.write(INVALID_REQUEST);
-  res.end();
-}
-
-
-//===----------------------------------------------------------------------===//
-// handlePOST
-//===----------------------------------------------------------------------===//
-Server.prototype.handlePOST = function(req, res) {
-  var buffer = '';
-  var self = this;
-  var handle = function (buf) {
-    var decoded = JSON.parse(buf);
-
-    // Check for the required fields, and if they aren't there, then
-    // dispatch to the handleInvalidRequest function.
-    if(!(decoded.method && decoded.params)) {
-      return Server.handleInvalidRequest(req, res);
-    }
-
-    if(!self.functions.hasOwnProperty(decoded.method)) {
-      return Server.handleInvalidRequest(req, res);
-    }
-
-    // Build our success handler
-    var onSuccess = function(funcResp) {
-      Server.trace('-->', 'response (id ' + decoded.id + '): ' +
-                    JSON.stringify(funcResp));
-
-      var encoded = JSON.stringify({
-        'result': funcResp,
-        'error': null,
-        'id': decoded.id
-      });
-
-      res.writeHead(200, {'Content-Type': 'application/json',
-                          'Content-Length': encoded.length});
-      res.write(encoded);
-      res.end();
-    };
-
-    // Build our failure handler (note that error must not be null)
-    var onFailure = function(failure) {
-      Server.trace('-->', 'failure: ' + JSON.stringify(failure));
-      var encoded = JSON.stringify({
-        'result': null,
-        'error': failure || 'Unspecified Failure',
-        'id': decoded.id
-      });
-      res.writeHead(200, {'Content-Type': 'application/json',
-                          'Content-Length': encoded.length});
-      res.write(encoded);
-      res.end();
-    };
-
-    Server.trace('<--', 'request (id ' + decoded.id + '): ' +
-                  decoded.method + '(' + decoded.params.join(', ') + ')');
-
-    // Try to call the method, but intercept errors and call our
-    // onFailure handler.
-    var method = self.functions[decoded.method];
-    var args = decoded.params.unshift(function(resp) {
-      onSuccess(resp);
-    });
-
-    try {
-      method.apply(null, decoded.params);
-    }
-    catch(err) {
-      return onFailure(err);
-    }
-
-  } // function handle(buf)
-
-  req.addListener('data', function(chunk) {
-    buffer = buffer + chunk;
-  });
-
-  req.addListener('end', function() {
-    handle(buffer);
-  });
-}
-
-
-//===----------------------------------------------------------------------===//
-// handleNonPOST
-//===----------------------------------------------------------------------===//
-Server.handleNonPOST = function(req, res) {
-  res.writeHead(405, {'Content-Type': 'text/plain',
-                      'Content-Length': METHOD_NOT_ALLOWED.length,
-                      'Allow': 'POST'});
-  res.write(METHOD_NOT_ALLOWED);
-  res.end();
-}
-
-
-module.exports.Server = Server;
 module.exports.Client = Client;