cleaning up references to PathwayModel