Clean up

Change-Id: I3ebc20cf420bb3005fdb48b0a5ac14d84895a858