code cleanup

Change-Id: I93525a43f781defdde190cce00d0aa2648143fed