Minor formatting and Remove unused unlocked_restoreItem()

Change-Id: I00f1e7a238176d9983290905b091ebb53177fc4c
Reviewed-on: http://review.couchbase.org/29153
Reviewed-by: Sundararaman Sridharan <sundar.sridharan@gmail.com>
Tested-by: Sundararaman Sridharan <sundar.sridharan@gmail.com>