Code Cleanup

Change-Id: I9d5c2169a24d7e9389c9c9fa07b433d33670f9aa