Do we need this commented code, and the line at 98?