Use the correct data primary PID
Clean up potentially obsolete code