STYLE: Remove unused commented-out code

Change-Id: Ib9814d89e841faca47ec4ed8cae3ad274ff2f75d