Remove some remaining references to message based timers

Some of this gets cleaned up in a later CL during the merge
but removing them now so the ptim removal change compiles.
2 files changed