Code Cleanup

Change-Id: Ia9a09f74cd52e307322013b36acbafbeb3517675