Removed some commented-out old code