more cleanup

Change-Id: If6a7f9d2007c91310068a20da80f880905668947