Remove unused csit macros and defaults