CleanUp and update of Forge and ThermalExpansion.