Template simplification
IMPORTANT HEARTBEAT FIX

heartbeat was not being started as it was enabled/disabled on enter/exit
of program mode, which is now gone.
stripping out of junk from macros