code cleanup

Change-Id: I4d3e0603772acdd9f90b8d271ae42f03067247bb