minor cleanup on RPC trade_MP PR