Cleanup

Change-Id: I0330e9a6474cad0833eead38cfb4600a4e4c4275