Removed some commented-out test code