Revert "Code cleanup"

This reverts commit c99cc56345b35a29c141403adb69814779496913.

Change-Id: I7b6ba1784589205315e93dd3d13c747946f334ba
Reviewed-on: http://review.couchbase.org/34179
Reviewed-by: Sarath Lakshman <sarath@couchbase.com>
Tested-by: Volker Mische <volker.mische@gmail.com>