Is this commented code still needed for some reason?