code cleanup

Change-Id: I1d4e28258eae12dbd2cc93662e412a7eb457da50