Clean up

Change-Id: I52b33fa244c6dfc7d30e10fb67a6e4dabae3b2ac