Added cleanup for sahara objects

This change is required befor adding any sahara benchmarks.

Change-Id: I5f35cb17cfbacdee80afc7e5c153e6acea6451bb
Merge "Added cleanup for sahara objects"