added couchbase & clean up