Cleanup function added.

Change-Id: Id9e4ea1a91cacea0997dc5877a417a0775433db9