Clean up

Change-Id: I9387aa0330569f76ab3891f32c4c9e2577eb4372