code cleanup

Change-Id: I1513c3320db43170fdd2c29fccbfca3cb8e990a6