Put thermo in the new init form and move includes as much as possible to
the source files
Removed unused variables from the dry_thermo