staging: thermal: cleanup from merge