Cleanups

Change-Id: I29816770e870ed66a28f8f77af74aae9f85f7d01