Cleanups

Change-Id: I46e17d073750a0cb1fcc0c9caa836e12f2bd2985