code cleanup

Change-Id: I7edb50a9c6bbc92aead067624d511a3ac0b15071