Remove accidentally-committed commented-out code