Fixing cleanup problem

Change-Id: I58961d3c683a3bbd53403a944c2c94746f4cd0c2