finished updates for removing couchbase dependency.  still needs more testing however.