Simplify for maestro_agent 2.1.x