style: Remove commented-out code

Test: continues to compile
Change-Id: I94f3e869621bcffd1aba678894ac14fc3800184f
7 files changed