Cleanup of reference form fields. ReferenceField now uses pk and no longer id for the primary key