clean up commented-out code [ci skip]