Update the Agile planner and clean up comments in the model