Remove unused CM-based headers for thermal