Clean up

Change-Id: I14ababd3adb39cbde0ae3b5622b21fe72eb06ad9