Need to clean up this commented-out code