Removing more dependencies on study_date