Code Cleanup

Change-Id: I6efebd1b40315960af31d52fcbda109d911ea923