Code Cleanup

Change-Id: I6f6333f33507d09ca7b08c807f62e98314889a7c