Clean up

Change-Id: I583a5eb8516dbc667441e538809282d2606120c8