Remove this commented out code?