Code Cleanup

Change-Id: I95c176bb2e56b34d21a7e3ffdf11cab02b26fc15