CBQE-1362: code clean up

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