Clean up

Change-Id: Ibf6730ac3feb23328ebe6e3ae7e5cd7f44384c33