Deleted a bunch of commented-out old stuff