Finish heater designs and cleanup some code garbage