MB-100: reverted clean-up setup script

partially reverted c9a7b41a43ab9e38f468dd70497974ccbbba51e0

http://review.couchbase.org/26538

Change-Id: I62d0e4f59f5e3a37b99d2bb14056ebf81e4daae6
Reviewed-on: http://review.couchbase.org/26567
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>