code cleanup

Change-Id: I7af612c13aff48d0d20a0e8f83ea43c8941dcaaf
(cherry picked from commit ca29638e25f2de4a1a9fc26ed53be30f55fc96a7)