code cleanup

Change-Id: I21ef493ed585dfed685e2e53c439fecf530cb100