more cleanup

Change-Id: I8b0abc671b47bb9db8e0223f2831b2734ba31b3a