Code Cleanup

Change-Id: I59c96be0ba39ac228110d7c0ba937c93dde5697c