Minor cleanup unused variables, all thermo's cleared now
Merge remote-tracking branch 'upstream/master'