Heatcleanup

Perform some more heat.enabled cleanups