Remove commented-out unused lines