cleanup for first dp.

Change-Id: Ie988e581eed87b624fd5adb56620746d3cb654c7
Reviewed-on: http://review.couchbase.org/37500
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>