Code cleanup: Improve code readability and remove dead code.

Change-Id: Ic7fc159eb19a9eef210afc1fca45b8a646321f2c
1 file changed