diff --git a/lib/runosaari/area.ex b/lib/runosaari/area.ex
deleted file mode 100644
index bb2b4ea..0000000
--- a/lib/runosaari/area.ex
+++ /dev/null
@@ -1,104 +0,0 @@
-defmodule Runosaari.Area do
-  @moduledoc """
-  The Area context.
-  """
-
-  import Ecto.Query, warn: false
-  alias Runosaari.Repo
-
-  alias Runosaari.Area.Location
-
-  @doc """
-  Returns the list of locations.
-
-  ## Examples
-
-      iex> list_locations()
-      [%Location{}, ...]
-
-  """
-  def list_locations do
-    Repo.all(Location)
-  end
-
-  @doc """
-  Gets a single location.
-
-  Raises `Ecto.NoResultsError` if the Location does not exist.
-
-  ## Examples
-
-      iex> get_location!(123)
-      %Location{}
-
-      iex> get_location!(456)
-      ** (Ecto.NoResultsError)
-
-  """
-  def get_location!(id), do: Repo.get!(Location, id)
-
-  @doc """
-  Creates a location.
-
-  ## Examples
-
-      iex> create_location(%{field: value})
-      {:ok, %Location{}}
-
-      iex> create_location(%{field: bad_value})
-      {:error, %Ecto.Changeset{}}
-
-  """
-  def create_location(attrs \\ %{}) do
-    %Location{}
-    |> Location.changeset(attrs)
-    |> Repo.insert()
-  end
-
-  @doc """
-  Updates a location.
-
-  ## Examples
-
-      iex> update_location(location, %{field: new_value})
-      {:ok, %Location{}}
-
-      iex> update_location(location, %{field: bad_value})
-      {:error, %Ecto.Changeset{}}
-
-  """
-  def update_location(%Location{} = location, attrs) do
-    location
-    |> Location.changeset(attrs)
-    |> Repo.update()
-  end
-
-  @doc """
-  Deletes a location.
-
-  ## Examples
-
-      iex> delete_location(location)
-      {:ok, %Location{}}
-
-      iex> delete_location(location)
-      {:error, %Ecto.Changeset{}}
-
-  """
-  def delete_location(%Location{} = location) do
-    Repo.delete(location)
-  end
-
-  @doc """
-  Returns an `%Ecto.Changeset{}` for tracking location changes.
-
-  ## Examples
-
-      iex> change_location(location)
-      %Ecto.Changeset{data: %Location{}}
-
-  """
-  def change_location(%Location{} = location, attrs \\ %{}) do
-    Location.changeset(location, attrs)
-  end
-end
diff --git a/lib/runosaari/area/location.ex b/lib/runosaari/area/location.ex
deleted file mode 100644
index e42ed5f..0000000
--- a/lib/runosaari/area/location.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Runosaari.Area.Location do
-  use Ecto.Schema
-  import Ecto.Changeset
-
-  schema "locations" do
-    field :address, :string
-    field :description, :string
-    field :max_seats, :integer
-    field :name, :string
-    field :reserved_seats, :integer
-
-    timestamps()
-  end
-
-  @doc false
-  def changeset(location, attrs) do
-    location
-    |> cast(attrs, [:name, :address, :reserved_seats, :max_seats, :description])
-    |> validate_required([:name, :address, :reserved_seats, :max_seats, :description])
-  end
-end
diff --git a/lib/runosaari/schedule/performance.ex b/lib/runosaari/schedule/performance.ex
index 5d27a0c..42ff1ac 100644
--- a/lib/runosaari/schedule/performance.ex
+++ b/lib/runosaari/schedule/performance.ex
@@ -6,7 +6,6 @@ defmodule Runosaari.Schedule.Performance do
     field :description, :string
     field :notes, :string
     field :time, :naive_datetime
-    field :location_id, :id
     field :performer_id, :id
 
     timestamps()
diff --git a/lib/runosaari_web/templates/layout/app.html.eex b/lib/runosaari_web/templates/layout/app.html.eex
index 10ee95e..4ed4ddf 100644
--- a/lib/runosaari_web/templates/layout/app.html.eex
+++ b/lib/runosaari_web/templates/layout/app.html.eex
@@ -16,8 +16,8 @@
     <header >
         <nav class="nav" role="navigation">
           <%= link "Etusivu", to: Routes.page_path(@conn, :index) %>
-          <%= link "Esiintyjät", to: Routes.performer_path(@conn, :index) %>
           <%= link "Ohjelma", to: Routes.performance_path(@conn, :index) %>
+          <%= link "Esiintyjät", to: Routes.performer_path(@conn, :index) %>
           <%= link "Info", to: Routes.page_path(@conn, :info) %>
           <%= link "Covid-19", to: Routes.page_path(@conn, :covid19) %>
           <%= link "Ilmoittautuminen", to: Routes.admin_performer_path(@conn, :new) %>
diff --git a/lib/runosaari_web/templates/performance/form.html.eex b/lib/runosaari_web/templates/performance/form.html.eex
index a9a452e..633eeb9 100644
--- a/lib/runosaari_web/templates/performance/form.html.eex
+++ b/lib/runosaari_web/templates/performance/form.html.eex
@@ -9,10 +9,6 @@
   <%= datetime_select f, :time %>
   <%= error_tag f, :time %>
 
-  <%= label f, :location_id %>
-  <%= select f, :location_id, Runosaari.Area.list_locations |> Enum.map(fn loc -> {loc.name, loc.id} end)%>
-  <%= error_tag f, :location_id %>
-
   <%= label f, :performer_id %>
   <%= multiple_select f, :performer_id, Runosaari.Registration.list_performers |> Enum.map(fn perf -> {perf.fname <> " " <> perf.lname, perf.id} end) %>
   <%= error_tag f, :performer_id %>
diff --git a/test/runosaari/area_test.exs b/test/runosaari/area_test.exs
deleted file mode 100644
index 86e7df3..0000000
--- a/test/runosaari/area_test.exs
+++ /dev/null
@@ -1,72 +0,0 @@
-defmodule Runosaari.AreaTest do
-  use Runosaari.DataCase
-
-  alias Runosaari.Area
-
-  describe "locations" do
-    alias Runosaari.Area.Location
-
-    @valid_attrs %{address: "some address", description: "some description", max_seats: 42, name: "some name", reserved_seats: 42}
-    @update_attrs %{address: "some updated address", description: "some updated description", max_seats: 43, name: "some updated name", reserved_seats: 43}
-    @invalid_attrs %{address: nil, description: nil, max_seats: nil, name: nil, reserved_seats: nil}
-
-    def location_fixture(attrs \\ %{}) do
-      {:ok, location} =
-        attrs
-        |> Enum.into(@valid_attrs)
-        |> Area.create_location()
-
-      location
-    end
-
-    test "list_locations/0 returns all locations" do
-      location = location_fixture()
-      assert Area.list_locations() == [location]
-    end
-
-    test "get_location!/1 returns the location with given id" do
-      location = location_fixture()
-      assert Area.get_location!(location.id) == location
-    end
-
-    test "create_location/1 with valid data creates a location" do
-      assert {:ok, %Location{} = location} = Area.create_location(@valid_attrs)
-      assert location.address == "some address"
-      assert location.description == "some description"
-      assert location.max_seats == 42
-      assert location.name == "some name"
-      assert location.reserved_seats == 42
-    end
-
-    test "create_location/1 with invalid data returns error changeset" do
-      assert {:error, %Ecto.Changeset{}} = Area.create_location(@invalid_attrs)
-    end
-
-    test "update_location/2 with valid data updates the location" do
-      location = location_fixture()
-      assert {:ok, %Location{} = location} = Area.update_location(location, @update_attrs)
-      assert location.address == "some updated address"
-      assert location.description == "some updated description"
-      assert location.max_seats == 43
-      assert location.name == "some updated name"
-      assert location.reserved_seats == 43
-    end
-
-    test "update_location/2 with invalid data returns error changeset" do
-      location = location_fixture()
-      assert {:error, %Ecto.Changeset{}} = Area.update_location(location, @invalid_attrs)
-      assert location == Area.get_location!(location.id)
-    end
-
-    test "delete_location/1 deletes the location" do
-      location = location_fixture()
-      assert {:ok, %Location{}} = Area.delete_location(location)
-      assert_raise Ecto.NoResultsError, fn -> Area.get_location!(location.id) end
-    end
-
-    test "change_location/1 returns a location changeset" do
-      location = location_fixture()
-      assert %Ecto.Changeset{} = Area.change_location(location)
-    end
-  end
-end