CBQE-1362: clean up code

Change-Id: I43013f53b0bd7db88edef457fc49f369ceb36e8e
Reviewed-on: http://review.couchbase.org/27161
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Deepkaran Salooja <deepkaran.salooja@globallogic.com>