Replaced a bunch of chai stuff with claire.
Remove a bunch more chai stuff.