Cleanup

Change-Id: I2ae764d7ecd458e2f95cf5fd8f64e40d5d654dc3