small MCP and solver cleanup