Should we just remove this commented out code?