Clean up

Change-Id: I48bcec437eee6548759465727aa7d1e1341496b7