cleared up some commented-out debugging code