Cleaning up current-temp