Cleanup: Fixed some comments, formatting, removed dead code

* No change in functionality or parser test results.

Change-Id: I66a7b1f2a1618d0809d6783156fcc6bc89b44885