remove commented-out code

Change-Id: I073aa60d3f18d6053cd6d59f9be9241cccb954bc