Merge "style: Remove commented-out code"