code cleanup

Change-Id: Idac798cfcf8a50d4b7c9a3c3d062c492fcfc5b47