Wireless class cleanup (especially around time sync), and change in message re-send system