more cleanup

Change-Id: Ibda0addcb61774d8c0e23a8a2b56e4dce8248767