ThermalUC cleanup