Clean up

Change-Id: I10bda77e91da2b7fd5661d9588d7d0915981620a