Code Cleanup

Change-Id: I24fe34d7fcb43ae5f8d2abfdbcb7a926b68e4753