     GenServer.from,
     state) :: {:reply, {:ok, Account.id} | {:error, :notfound}, state}
   @doc false
-  def handle_call({:account, :create, params, req}, _from, state) do
+  def handle_call({:account, :create, params}, _from, state) do
     case AccountController.create(params) do
       {:ok, account} ->
         msg = %{account_id: account.account_id}
-        Broker.cast("event:account:created", msg, request: req)
+        Broker.cast("event:account:created", msg)
         {:reply, {:ok, account}, state}
       {:error, error} ->
-        {:reply, {:error, error}, state}
-      error ->
         {:reply, {:error, error}, state}
     end
   end

    GenServer.start_link(__MODULE__, [], name: :account_service)
  end

  @spec init(any) :: {:ok, state}
  def init(_args) do
    Broker.subscribe("account:create", call: &handle_broker_call/4)

    {:ok, nil}
  end

  @spec handle_call(
    {:account, :create, Account.creation_params},
    GenServer.from,
    state) :: {:reply, {:ok, Account.t} | {:error, Ecto.Changeset.t}, state}
  @spec handle_call(
