code cleanup

Change-Id: I7af612c13aff48d0d20a0e8f83ea43c8941dcaaf