Cleanup

Change-Id: I11c1ace7a037b907e0dbc5a4eef03a14e6ce498c