Clean up

Change-Id: Ia45735e20b7ba500b33b0a684c6e7de5c6575841