Do we need this commented out code?