Got rid of some commented-out old code