Planner function call fix. More clean up.