code cleanup

Change-Id: I74d3e75a2b10f453a7d8589614a56e7764f0c5e4