Cleanup

Change-Id: I2eac28e8c12dddca38448c20cd579cf07d7e5601