A few more current day tweaks; Removing old XBee stuff