minor cleanup

Change-Id: I162df16386cfe2b84f293ce36059f9e50e2a8d3a