legacy code cleanup

Change-Id: I31e059f4836f3e105c3e2814272ef3fa159d0560
Reviewed-on: http://review.couchbase.org/24724
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>