Is this code still needed?