Cleanup

Change-Id: I57b86f4be2848b70f9fe603882c42dec06798967