more code cleanup

Change-Id: I59ab51dbee6692e0a18ebb016d3ba65bbb4d5d94