remove unneeded stuff

Change-Id: I5f23449ed5945f0c15cc7f1c09020b7f050a4e5e
Reviewed-on: http://review.couchbase.org/30403
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>