remove hackish stuff from heater code