Code Cleanup

Change-Id: I899d8adab5612601734bfd153dbcd258ddc6c88d