Adjustments from code review

Attempt to remove all direct references to chai