Clean up planner 18