Could we maybe just remove this commented out code?