General cleanup

Change-Id: Icfbe930f01b74297fe1d3c2285a240a0bea7dd02