Changed typekit, some cleaning