nit: remove commented-out code