Clean up

Change-Id: Ib41c15aad0909d79f962fe3a28e642f2f3929759