deleted some commented-out, unnecesary stuff