Minor changes to device firmware - removed some old planner code, etc