Some cleanup of part numbers.