Remove references to 'firstPart'