Fixed cleanup.

Change-Id: I7411e5ff2b4ea7fbd1e6d6ed6dcd9b3e2fbd70d6