diff --git a/.drone.yml b/.drone.yml
index bee4295..dea2d57 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -166,7 +166,7 @@ environment:
 
 steps:
   - name: renovate
-    image: renovate/renovate:42.75
+    image: renovate/renovate:42.74
     environment:
       RENOVATE_CONFIG_FILE: "renovate_backend_config.js"
       RENOVATE_TOKEN:
diff --git a/lib/mv/authorization/checks/has_permission.ex b/lib/mv/authorization/checks/has_permission.ex
deleted file mode 100644
index 345d6e4..0000000
--- a/lib/mv/authorization/checks/has_permission.ex
+++ /dev/null
@@ -1,239 +0,0 @@
-defmodule Mv.Authorization.Checks.HasPermission do
-  @moduledoc """
-  Custom Ash Policy Check that evaluates permissions from the PermissionSets module.
-
-  This check:
-  1. Reads the actor's role and permission_set_name
-  2. Looks up permissions from PermissionSets.get_permissions/1
-  3. Finds matching permission for current resource + action
-  4. Applies scope filter (:own, :linked, :all)
-
-  ## Usage in Ash Resource
-
-      policies do
-        policy action_type(:read) do
-          authorize_if Mv.Authorization.Checks.HasPermission
-        end
-      end
-
-  ## Scope Behavior
-
-  - **:all** - Authorizes without filtering (returns all records)
-  - **:own** - Filters to records where record.id == actor.id
-  - **:linked** - Filters based on resource type:
-    - Member: member.user.id == actor.id (via has_one :user relationship)
-    - CustomFieldValue: custom_field_value.member.user.id == actor.id (traverses member → user relationship!)
-
-  ## Error Handling
-
-  Returns `false` for:
-  - Missing actor
-  - Actor without role
-  - Invalid permission_set_name
-  - No matching permission found
-
-  All errors result in Forbidden (policy fails).
-
-  ## Examples
-
-      # In a resource policy
-      policies do
-        policy action_type([:read, :create, :update, :destroy]) do
-          authorize_if Mv.Authorization.Checks.HasPermission
-        end
-      end
-  """
-
-  use Ash.Policy.Check
-  require Ash.Query
-  import Ash.Expr
-  alias Mv.Authorization.PermissionSets
-  require Logger
-
-  @impl true
-  def describe(_opts) do
-    "checks if actor has permission via their role's permission set"
-  end
-
-  @impl true
-  def strict_check(actor, authorizer, _opts) do
-    resource = authorizer.resource
-    action = get_action_from_authorizer(authorizer)
-
-    cond do
-      is_nil(actor) ->
-        log_auth_failure(actor, resource, action, "no actor")
-        {:ok, false}
-
-      is_nil(action) ->
-        log_auth_failure(
-          actor,
-          resource,
-          action,
-          "authorizer subject shape unsupported (no action)"
-        )
-
-        {:ok, false}
-
-      true ->
-        strict_check_with_permissions(actor, resource, action)
-    end
-  end
-
-  # Helper function to reduce nesting depth
-  defp strict_check_with_permissions(actor, resource, action) do
-    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- actor,
-         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
-         permissions <- PermissionSets.get_permissions(ps_atom),
-         resource_name <- get_resource_name(resource) do
-      case check_permission(
-             permissions.resources,
-             resource_name,
-             action,
-             actor,
-             resource_name
-           ) do
-        :authorized -> {:ok, true}
-        {:filter, _} -> {:ok, :unknown}
-        false -> {:ok, false}
-      end
-    else
-      %{role: nil} ->
-        log_auth_failure(actor, resource, action, "no role assigned")
-        {:ok, false}
-
-      %{role: %{permission_set_name: nil}} ->
-        log_auth_failure(actor, resource, action, "role has no permission_set_name")
-        {:ok, false}
-
-      {:error, :invalid_permission_set} ->
-        log_auth_failure(actor, resource, action, "invalid permission_set_name")
-        {:ok, false}
-
-      _ ->
-        log_auth_failure(actor, resource, action, "missing data")
-        {:ok, false}
-    end
-  end
-
-  @impl true
-  def auto_filter(actor, authorizer, _opts) do
-    resource = authorizer.resource
-    action = get_action_from_authorizer(authorizer)
-
-    cond do
-      is_nil(actor) -> nil
-      is_nil(action) -> nil
-      true -> auto_filter_with_permissions(actor, resource, action)
-    end
-  end
-
-  # Helper function to reduce nesting depth
-  defp auto_filter_with_permissions(actor, resource, action) do
-    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- actor,
-         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
-         permissions <- PermissionSets.get_permissions(ps_atom),
-         resource_name <- get_resource_name(resource) do
-      case check_permission(
-             permissions.resources,
-             resource_name,
-             action,
-             actor,
-             resource_name
-           ) do
-        :authorized -> nil
-        {:filter, filter_expr} -> filter_expr
-        false -> nil
-      end
-    else
-      _ -> nil
-    end
-  end
-
-  # Helper to extract action from authorizer
-  defp get_action_from_authorizer(authorizer) do
-    case authorizer.subject do
-      %{action: %{name: action}} -> action
-      %{action: action} when is_atom(action) -> action
-      _ -> nil
-    end
-  end
-
-  # Extract resource name from module (e.g., Mv.Membership.Member -> "Member")
-  defp get_resource_name(resource) when is_atom(resource) do
-    resource |> Module.split() |> List.last()
-  end
-
-  # Find matching permission and apply scope
-  defp check_permission(resource_perms, resource_name, action, actor, resource_name_for_logging) do
-    case Enum.find(resource_perms, fn perm ->
-           perm.resource == resource_name and perm.action == action and perm.granted
-         end) do
-      nil ->
-        log_auth_failure(actor, resource_name_for_logging, action, "no matching permission found")
-        false
-
-      perm ->
-        apply_scope(perm.scope, actor, resource_name)
-    end
-  end
-
-  # Scope: all - No filtering, access to all records
-  defp apply_scope(:all, _actor, _resource) do
-    :authorized
-  end
-
-  # Scope: own - Filter to records where record.id == actor.id
-  # Used for User resource (users can access their own user record)
-  defp apply_scope(:own, actor, _resource) do
-    {:filter, expr(id == ^actor.id)}
-  end
-
-  # Scope: linked - Filter based on user relationship (resource-specific!)
-  # Uses Ash relationships: Member has_one :user, CustomFieldValue belongs_to :member
-  defp apply_scope(:linked, actor, resource_name) do
-    case resource_name do
-      "Member" ->
-        # Member has_one :user → filter by user.id == actor.id
-        {:filter, expr(user.id == ^actor.id)}
-
-      "CustomFieldValue" ->
-        # CustomFieldValue belongs_to :member → member has_one :user
-        # Traverse: custom_field_value.member.user.id == actor.id
-        {:filter, expr(member.user.id == ^actor.id)}
-
-      _ ->
-        # Fallback for other resources: try user relationship first, then user_id
-        {:filter, expr(user.id == ^actor.id or user_id == ^actor.id)}
-    end
-  end
-
-  # Log authorization failures for debugging (lazy evaluation)
-  defp log_auth_failure(actor, resource, action, reason) do
-    Logger.debug(fn ->
-      actor_id = if is_map(actor), do: Map.get(actor, :id), else: "nil"
-      resource_name = get_resource_name_for_logging(resource)
-
-      """
-      Authorization failed:
-        Actor: #{actor_id}
-        Resource: #{resource_name}
-        Action: #{inspect(action)}
-        Reason: #{reason}
-      """
-    end)
-  end
-
-  # Helper to extract resource name for logging (handles both atoms and strings)
-  defp get_resource_name_for_logging(resource) when is_atom(resource) do
-    resource |> Module.split() |> List.last()
-  end
-
-  defp get_resource_name_for_logging(resource) when is_binary(resource) do
-    resource
-  end
-
-  defp get_resource_name_for_logging(_resource) do
-    "unknown"
-  end
-end
diff --git a/lib/mv_web.ex b/lib/mv_web.ex
index 8589be1..46e4e8b 100644
--- a/lib/mv_web.ex
+++ b/lib/mv_web.ex
@@ -89,9 +89,6 @@ defmodule MvWeb do
       # Core UI components
       import MvWeb.CoreComponents
 
-      # Authorization helpers
-      import MvWeb.Authorization, only: [can?: 3, can_access_page?: 2]
-
       # Common modules used in templates
       alias Phoenix.LiveView.JS
       alias MvWeb.Layouts
diff --git a/lib/mv_web/authorization.ex b/lib/mv_web/authorization.ex
deleted file mode 100644
index 95a8524..0000000
--- a/lib/mv_web/authorization.ex
+++ /dev/null
@@ -1,206 +0,0 @@
-defmodule MvWeb.Authorization do
-  @moduledoc """
-  UI-level authorization helpers for LiveView templates.
-
-  These functions check if the current user has permission to perform actions
-  or access pages. They use the same PermissionSets module as the backend policies,
-  ensuring UI and backend authorization are consistent.
-
-  ## Usage in Templates
-
-      <!-- Conditional button rendering -->
-      <%= if can?(@current_user, :create, Mv.Membership.Member) do %>
-        <.link patch={~p"/members/new"}>New Member</.link>
-      <% end %>
-
-      <!-- Record-level check -->
-      <%= if can?(@current_user, :update, @member) do %>
-        <.button>Edit</.button>
-      <% end %>
-
-      <!-- Page access check -->
-      <%= if can_access_page?(@current_user, "/admin/roles") do %>
-        <.link navigate="/admin/roles">Manage Roles</.link>
-      <% end %>
-
-  ## Performance
-
-  All checks are pure function calls using the hardcoded PermissionSets module.
-  No database queries, < 1 microsecond per check.
-  """
-
-  alias Mv.Authorization.PermissionSets
-
-  @doc """
-  Checks if user has permission for an action on a resource.
-
-  This function has two variants:
-  1. Resource atom: Checks if user has permission for action on resource type
-  2. Record struct: Checks if user has permission for action on specific record (with scope checking)
-
-  ## Examples
-
-      # Resource-level check (atom)
-      iex> admin = %{role: %{permission_set_name: "admin"}}
-      iex> can?(admin, :create, Mv.Membership.Member)
-      true
-
-      iex> mitglied = %{role: %{permission_set_name: "own_data"}}
-      iex> can?(mitglied, :create, Mv.Membership.Member)
-      false
-
-      # Record-level check (struct with scope)
-      iex> user = %{id: "user-123", role: %{permission_set_name: "own_data"}}
-      iex> member = %Member{id: "member-456", user: %User{id: "user-123"}}
-      iex> can?(user, :update, member)
-      true
-  """
-  @spec can?(map() | nil, atom(), atom() | struct()) :: boolean()
-  def can?(nil, _action, _resource), do: false
-
-  def can?(user, action, resource) when is_atom(action) and is_atom(resource) do
-    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
-         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
-         permissions <- PermissionSets.get_permissions(ps_atom) do
-      resource_name = get_resource_name(resource)
-
-      Enum.any?(permissions.resources, fn perm ->
-        perm.resource == resource_name and perm.action == action and perm.granted
-      end)
-    else
-      _ -> false
-    end
-  end
-
-  def can?(user, action, %resource{} = record) when is_atom(action) do
-    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
-         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
-         permissions <- PermissionSets.get_permissions(ps_atom) do
-      resource_name = get_resource_name(resource)
-
-      # Find matching permission
-      matching_perm =
-        Enum.find(permissions.resources, fn perm ->
-          perm.resource == resource_name and perm.action == action and perm.granted
-        end)
-
-      case matching_perm do
-        nil -> false
-        perm -> check_scope(perm.scope, user, record, resource_name)
-      end
-    else
-      _ -> false
-    end
-  end
-
-  @doc """
-  Checks if user can access a specific page.
-
-  ## Examples
-
-      iex> admin = %{role: %{permission_set_name: "admin"}}
-      iex> can_access_page?(admin, "/admin/roles")
-      true
-
-      iex> mitglied = %{role: %{permission_set_name: "own_data"}}
-      iex> can_access_page?(mitglied, "/members")
-      false
-  """
-  @spec can_access_page?(map() | nil, String.t() | Phoenix.VerifiedRoutes.unverified_path()) ::
-          boolean()
-  def can_access_page?(nil, _page_path), do: false
-
-  def can_access_page?(user, page_path) do
-    # Convert verified route to string if needed
-    page_path_str = if is_binary(page_path), do: page_path, else: to_string(page_path)
-
-    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
-         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
-         permissions <- PermissionSets.get_permissions(ps_atom) do
-      page_matches?(permissions.pages, page_path_str)
-    else
-      _ -> false
-    end
-  end
-
-  # Check if scope allows access to record
-  defp check_scope(:all, _user, _record, _resource_name), do: true
-
-  defp check_scope(:own, user, record, _resource_name) do
-    record.id == user.id
-  end
-
-  defp check_scope(:linked, user, record, resource_name) do
-    case resource_name do
-      "Member" -> check_member_linked(user, record)
-      "CustomFieldValue" -> check_custom_field_value_linked(user, record)
-      _ -> check_fallback_linked(user, record)
-    end
-  end
-
-  defp check_member_linked(user, record) do
-    # Member has_one :user (inverse of User belongs_to :member)
-    # Check if member.user.id == user.id (user must be preloaded)
-    case Map.get(record, :user) do
-      %{id: user_id} -> user_id == user.id
-      _ -> false
-    end
-  end
-
-  defp check_custom_field_value_linked(user, record) do
-    # Need to traverse: custom_field_value.member.user.id
-    # Note: In UI, custom_field_value should have member.user preloaded
-    case Map.get(record, :member) do
-      %{user: %{id: member_user_id}} -> member_user_id == user.id
-      _ -> false
-    end
-  end
-
-  defp check_fallback_linked(user, record) do
-    # Fallback: try user_id or user relationship
-    case Map.get(record, :user_id) do
-      nil -> check_user_relationship_linked(user, record)
-      user_id -> user_id == user.id
-    end
-  end
-
-  defp check_user_relationship_linked(user, record) do
-    # Try user relationship
-    case Map.get(record, :user) do
-      %{id: user_id} -> user_id == user.id
-      _ -> false
-    end
-  end
-
-  # Check if page path matches any allowed pattern
-  defp page_matches?(allowed_pages, requested_path) do
-    Enum.any?(allowed_pages, fn pattern ->
-      cond do
-        pattern == "*" -> true
-        pattern == requested_path -> true
-        String.contains?(pattern, ":") -> match_pattern?(pattern, requested_path)
-        true -> false
-      end
-    end)
-  end
-
-  # Match dynamic route pattern
-  defp match_pattern?(pattern, path) do
-    pattern_segments = String.split(pattern, "/", trim: true)
-    path_segments = String.split(path, "/", trim: true)
-
-    if length(pattern_segments) == length(path_segments) do
-      Enum.zip(pattern_segments, path_segments)
-      |> Enum.all?(fn {pattern_seg, path_seg} ->
-        String.starts_with?(pattern_seg, ":") or pattern_seg == path_seg
-      end)
-    else
-      false
-    end
-  end
-
-  # Extract resource name from module
-  defp get_resource_name(resource) when is_atom(resource) do
-    resource |> Module.split() |> List.last()
-  end
-end
diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index e3e9319..adc3444 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -7,7 +7,6 @@ defmodule MvWeb.Layouts.Navbar do
   use MvWeb, :verified_routes
 
   alias Mv.Membership
-  import MvWeb.Authorization
 
   attr :current_user, :map,
     required: true,
@@ -27,21 +26,7 @@ defmodule MvWeb.Layouts.Navbar do
         <a href="/members" class="btn btn-ghost text-xl">{@club_name}</a>
         <ul class="menu menu-horizontal bg-base-200">
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
-          <li>
-            <details>
-              <summary>{gettext("Settings")}</summary>
-              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
-                <li>
-                  <.link navigate="/settings">{gettext("Global Settings")}</.link>
-                </li>
-                <%= if can_access_page?(@current_user, ~p"/admin/roles") do %>
-                  <li>
-                    <.link navigate={~p"/admin/roles"}>{gettext("Roles")}</.link>
-                  </li>
-                <% end %>
-              </ul>
-            </details>
-          </li>
+          <li><.link navigate="/settings">{gettext("Settings")}</.link></li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
           <li>
             <details>
diff --git a/lib/mv_web/live/role_live/form.ex b/lib/mv_web/live/role_live/form.ex
deleted file mode 100644
index 7b74c7e..0000000
--- a/lib/mv_web/live/role_live/form.ex
+++ /dev/null
@@ -1,237 +0,0 @@
-defmodule MvWeb.RoleLive.Form do
-  @moduledoc """
-  LiveView form for creating and editing roles.
-
-  ## Features
-  - Create new roles
-  - Edit existing roles (name, description, permission_set_name)
-  - Custom dropdown for permission_set_name with badges
-  - Form validation
-
-  ## Security
-  Only admins can access this page (enforced by authorization).
-  """
-  use MvWeb, :live_view
-
-  alias Mv.Authorization.PermissionSets
-
-  import MvWeb.RoleLive.Helpers, only: [format_error: 1]
-
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {@page_title}
-        <:subtitle>{gettext("Use this form to manage roles in your database.")}</:subtitle>
-      </.header>
-
-      <.form class="max-w-xl" for={@form} id="role-form" phx-change="validate" phx-submit="save">
-        <.input field={@form[:name]} type="text" label={gettext("Name")} required />
-
-        <.input
-          field={@form[:description]}
-          type="textarea"
-          label={gettext("Description")}
-          rows="3"
-        />
-
-        <div class="form-control">
-          <label class="label" for="role-form_permission_set_name">
-            <span class="label-text font-semibold">
-              {gettext("Permission Set")}
-              <span class="text-red-700">*</span>
-            </span>
-          </label>
-          <select
-            class={[
-              "select select-bordered w-full",
-              @form.errors[:permission_set_name] && "select-error"
-            ]}
-            name="role[permission_set_name]"
-            id="role-form_permission_set_name"
-            required
-            aria-label={gettext("Permission Set")}
-          >
-            <option value="">{gettext("Select permission set")}</option>
-            <%= for permission_set <- all_permission_sets() do %>
-              <option
-                value={permission_set}
-                selected={@form[:permission_set_name].value == permission_set}
-              >
-                {format_permission_set_option(permission_set)}
-              </option>
-            <% end %>
-          </select>
-          <%= if @form.errors[:permission_set_name] do %>
-            <%= for error <- List.wrap(@form.errors[:permission_set_name]) do %>
-              <% {msg, _opts} = if is_tuple(error), do: error, else: {error, []} %>
-              <p class="mt-1.5 flex gap-2 items-center text-sm text-error">
-                <.icon name="hero-exclamation-circle" class="size-5" />
-                {msg}
-              </p>
-            <% end %>
-          <% end %>
-        </div>
-
-        <div class="mt-4">
-          <.button phx-disable-with={gettext("Saving...")} variant="primary" type="submit">
-            {gettext("Save Role")}
-          </.button>
-          <.button navigate={return_path(@return_to, @role)} type="button">
-            {gettext("Cancel")}
-          </.button>
-        </div>
-      </.form>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(params, _session, socket) do
-    case params["id"] do
-      nil ->
-        action = gettext("New")
-        page_title = action <> " " <> gettext("Role")
-
-        {:ok,
-         socket
-         |> assign(:return_to, return_to(params["return_to"]))
-         |> assign(:role, nil)
-         |> assign(:page_title, page_title)
-         |> assign_form()}
-
-      id ->
-        try do
-          case Ash.get(
-                 Mv.Authorization.Role,
-                 id,
-                 domain: Mv.Authorization,
-                 actor: socket.assigns[:current_user]
-               ) do
-            {:ok, role} ->
-              action = gettext("Edit")
-              page_title = action <> " " <> gettext("Role")
-
-              {:ok,
-               socket
-               |> assign(:return_to, return_to(params["return_to"]))
-               |> assign(:role, role)
-               |> assign(:page_title, page_title)
-               |> assign_form()}
-
-            {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
-              {:ok,
-               socket
-               |> put_flash(:error, gettext("Role not found."))
-               |> redirect(to: ~p"/admin/roles")}
-
-            {:error, error} ->
-              {:ok,
-               socket
-               |> put_flash(:error, format_error(error))
-               |> redirect(to: ~p"/admin/roles")}
-          end
-        rescue
-          e in [Ash.Error.Invalid] ->
-            # Handle exceptions that Ash.get might throw (e.g., policy violations)
-            case e do
-              %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
-                {:ok,
-                 socket
-                 |> put_flash(:error, gettext("Role not found."))
-                 |> redirect(to: ~p"/admin/roles")}
-
-              _ ->
-                reraise e, __STACKTRACE__
-            end
-        end
-    end
-  end
-
-  @spec return_to(String.t() | nil) :: String.t()
-  defp return_to("show"), do: "show"
-  defp return_to(_), do: "index"
-
-  @impl true
-  def handle_event("validate", %{"role" => role_params}, socket) do
-    validated_form = AshPhoenix.Form.validate(socket.assigns.form, role_params)
-    {:noreply, assign(socket, form: validated_form)}
-  end
-
-  def handle_event("save", %{"role" => role_params}, socket) do
-    case AshPhoenix.Form.submit(socket.assigns.form, params: role_params) do
-      {:ok, role} ->
-        notify_parent({:saved, role})
-
-        redirect_path =
-          if socket.assigns.return_to == "show" do
-            ~p"/admin/roles/#{role.id}"
-          else
-            ~p"/admin/roles"
-          end
-
-        socket =
-          socket
-          |> put_flash(:info, gettext("Role saved successfully."))
-          |> push_navigate(to: redirect_path)
-
-        {:noreply, socket}
-
-      {:error, form} ->
-        {:noreply, assign(socket, form: form)}
-    end
-  end
-
-  @spec notify_parent(any()) :: any()
-  defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
-
-  @spec assign_form(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t()
-  defp assign_form(%{assigns: %{role: role, current_user: actor}} = socket) do
-    form =
-      if role do
-        AshPhoenix.Form.for_update(role, :update_role,
-          domain: Mv.Authorization,
-          as: "role",
-          actor: actor
-        )
-      else
-        AshPhoenix.Form.for_create(
-          Mv.Authorization.Role,
-          :create_role,
-          domain: Mv.Authorization,
-          as: "role",
-          actor: actor
-        )
-      end
-
-    assign(socket, form: to_form(form))
-  end
-
-  defp all_permission_sets do
-    PermissionSets.all_permission_sets() |> Enum.map(&Atom.to_string/1)
-  end
-
-  defp format_permission_set_option("own_data"),
-    do: gettext("own_data - Access only to own data")
-
-  defp format_permission_set_option("read_only"),
-    do: gettext("read_only - Read access to all data")
-
-  defp format_permission_set_option("normal_user"),
-    do: gettext("normal_user - Create/Read/Update access")
-
-  defp format_permission_set_option("admin"),
-    do: gettext("admin - Unrestricted access")
-
-  defp format_permission_set_option(set), do: set
-
-  @spec return_path(String.t(), Mv.Authorization.Role.t() | nil) :: String.t()
-  defp return_path("index", _role), do: ~p"/admin/roles"
-  defp return_path("show", role) when not is_nil(role), do: ~p"/admin/roles/#{role.id}"
-  defp return_path("show", _role), do: ~p"/admin/roles"
-  defp return_path(_, role) when not is_nil(role), do: ~p"/admin/roles/#{role.id}"
-  defp return_path(_, _role), do: ~p"/admin/roles"
-end
diff --git a/lib/mv_web/live/role_live/helpers.ex b/lib/mv_web/live/role_live/helpers.ex
deleted file mode 100644
index 8fbc544..0000000
--- a/lib/mv_web/live/role_live/helpers.ex
+++ /dev/null
@@ -1,44 +0,0 @@
-defmodule MvWeb.RoleLive.Helpers do
-  @moduledoc """
-  Shared helper functions for RoleLive modules.
-  """
-  use Gettext, backend: MvWeb.Gettext
-
-  @doc """
-  Formats an error for display to the user.
-  Extracts error messages from Ash.Error.Invalid and joins them.
-  """
-  @spec format_error(Ash.Error.Invalid.t() | String.t() | any()) :: String.t()
-  def format_error(%Ash.Error.Invalid{} = error) do
-    Enum.map_join(error.errors, ", ", fn e -> e.message end)
-  end
-
-  def format_error(error) when is_binary(error), do: error
-  def format_error(_error), do: gettext("An error occurred")
-
-  @doc """
-  Returns the CSS badge class for a permission set name.
-  """
-  @spec permission_set_badge_class(String.t()) :: String.t()
-  def permission_set_badge_class("own_data"), do: "badge badge-neutral badge-sm"
-  def permission_set_badge_class("read_only"), do: "badge badge-info badge-sm"
-  def permission_set_badge_class("normal_user"), do: "badge badge-success badge-sm"
-  def permission_set_badge_class("admin"), do: "badge badge-error badge-sm"
-  def permission_set_badge_class(_), do: "badge badge-ghost badge-sm"
-
-  @doc """
-  Builds Ash options with actor and domain, ensuring actor is never nil in real paths.
-  """
-  @spec opts_with_actor(keyword(), map() | nil, atom()) :: keyword()
-  def opts_with_actor(base_opts \\ [], actor, domain) do
-    opts = Keyword.put(base_opts, :domain, domain)
-
-    if actor do
-      Keyword.put(opts, :actor, actor)
-    else
-      require Logger
-      Logger.warning("opts_with_actor called with nil actor - this may bypass policies")
-      opts
-    end
-  end
-end
diff --git a/lib/mv_web/live/role_live/index.ex b/lib/mv_web/live/role_live/index.ex
deleted file mode 100644
index 9d75da6..0000000
--- a/lib/mv_web/live/role_live/index.ex
+++ /dev/null
@@ -1,170 +0,0 @@
-defmodule MvWeb.RoleLive.Index do
-  @moduledoc """
-  LiveView for displaying and managing the role list.
-
-  ## Features
-  - List all roles with name, description, permission_set_name, is_system_role
-  - Create new roles
-  - Navigate to role details and edit forms
-  - Delete non-system roles
-
-  ## Events
-  - `delete` - Remove a role from the database (only non-system roles)
-
-  ## Security
-  Only admins can access this page (enforced by authorization).
-  """
-  use MvWeb, :live_view
-
-  alias Mv.Accounts
-  alias Mv.Authorization
-
-  require Ash.Query
-
-  import MvWeb.RoleLive.Helpers,
-    only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
-
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
-  @impl true
-  def mount(_params, _session, socket) do
-    actor = socket.assigns[:current_user]
-    roles = load_roles(actor)
-    user_counts = load_user_counts(roles, actor)
-
-    {:ok,
-     socket
-     |> assign(:page_title, gettext("Listing Roles"))
-     |> assign(:roles, roles)
-     |> assign(:user_counts, user_counts)}
-  end
-
-  @impl true
-  def handle_event("delete", %{"id" => id}, socket) do
-    case Authorization.get_role(id, actor: socket.assigns.current_user) do
-      {:ok, role} ->
-        handle_delete_role(role, id, socket)
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Role not found.")
-         )}
-
-      {:error, error} ->
-        error_message = format_error(error)
-
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Failed to delete role: %{error}", error: error_message)
-         )}
-    end
-  end
-
-  defp handle_delete_role(role, id, socket) do
-    if role.is_system_role do
-      {:noreply,
-       put_flash(
-         socket,
-         :error,
-         gettext("System roles cannot be deleted.")
-       )}
-    else
-      user_count = recalculate_user_count(role, socket.assigns.current_user)
-
-      if user_count > 0 do
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext(
-             "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first.",
-             count: user_count
-           )
-         )}
-      else
-        perform_role_deletion(role, id, socket)
-      end
-    end
-  end
-
-  defp perform_role_deletion(role, id, socket) do
-    case Authorization.destroy_role(role, actor: socket.assigns.current_user) do
-      :ok ->
-        updated_roles = Enum.reject(socket.assigns.roles, &(&1.id == id))
-        updated_counts = Map.delete(socket.assigns.user_counts, id)
-
-        {:noreply,
-         socket
-         |> assign(:roles, updated_roles)
-         |> assign(:user_counts, updated_counts)
-         |> put_flash(:info, gettext("Role deleted successfully."))}
-
-      {:error, error} ->
-        error_message = format_error(error)
-
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Failed to delete role: %{error}", error: error_message)
-         )}
-    end
-  end
-
-  @spec load_roles(map() | nil) :: [Mv.Authorization.Role.t()]
-  defp load_roles(actor) do
-    opts = if actor, do: [actor: actor], else: []
-
-    case Authorization.list_roles(opts) do
-      {:ok, roles} -> Enum.sort_by(roles, & &1.name)
-      {:error, _} -> []
-    end
-  end
-
-  # Loads all user counts for roles using DB-side aggregation for better performance
-  @spec load_user_counts([Mv.Authorization.Role.t()], map() | nil) :: %{
-          Ecto.UUID.t() => non_neg_integer()
-        }
-  defp load_user_counts(roles, _actor) do
-    role_ids = Enum.map(roles, & &1.id)
-
-    # Use Ecto directly for efficient GROUP BY COUNT query
-    # This is much more performant than loading all users and counting in Elixir
-    # Note: We bypass Ash here for performance, but this is a simple read-only query
-    import Ecto.Query
-
-    query =
-      from u in Accounts.User,
-        where: u.role_id in ^role_ids,
-        group_by: u.role_id,
-        select: {u.role_id, count(u.id)}
-
-    results = Mv.Repo.all(query)
-
-    results
-    |> Enum.into(%{}, fn {role_id, count} -> {role_id, count} end)
-  end
-
-  # Gets user count from preloaded assigns map
-  @spec get_user_count(Mv.Authorization.Role.t(), %{Ecto.UUID.t() => non_neg_integer()}) ::
-          non_neg_integer()
-  defp get_user_count(role, user_counts) do
-    Map.get(user_counts, role.id, 0)
-  end
-
-  # Recalculates user count for a specific role (used before deletion)
-  @spec recalculate_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
-  defp recalculate_user_count(role, actor) do
-    opts = opts_with_actor([], actor, Mv.Accounts)
-
-    case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id), opts) do
-      {:ok, count} -> count
-      _ -> 0
-    end
-  end
-end
diff --git a/lib/mv_web/live/role_live/index.html.heex b/lib/mv_web/live/role_live/index.html.heex
deleted file mode 100644
index f409944..0000000
--- a/lib/mv_web/live/role_live/index.html.heex
+++ /dev/null
@@ -1,97 +0,0 @@
-<Layouts.app flash={@flash} current_user={@current_user}>
-  <.header>
-    {gettext("Listing Roles")}
-    <:subtitle>
-      {gettext("Manage user roles and their permission sets.")}
-    </:subtitle>
-    <:actions>
-      <%= if can?(@current_user, :create, Mv.Authorization.Role) do %>
-        <.button variant="primary" navigate={~p"/admin/roles/new"}>
-          <.icon name="hero-plus" /> {gettext("New Role")}
-        </.button>
-      <% end %>
-    </:actions>
-  </.header>
-
-  <.table
-    id="roles"
-    rows={@roles}
-    row_click={fn role -> JS.navigate(~p"/admin/roles/#{role}") end}
-  >
-    <:col :let={role} label={gettext("Name")}>
-      <div class="flex items-center gap-2">
-        <span class="font-medium">{role.name}</span>
-        <%= if role.is_system_role do %>
-          <span class="badge badge-warning badge-sm">{gettext("System Role")}</span>
-        <% end %>
-      </div>
-    </:col>
-
-    <:col :let={role} label={gettext("Description")}>
-      <%= if role.description do %>
-        <span class="text-sm">{role.description}</span>
-      <% else %>
-        <span class="text-base-content/70">{gettext("No description")}</span>
-      <% end %>
-    </:col>
-
-    <:col :let={role} label={gettext("Permission Set")}>
-      <span class={permission_set_badge_class(role.permission_set_name)}>
-        {role.permission_set_name}
-      </span>
-    </:col>
-
-    <:col :let={role} label={gettext("Type")}>
-      <%= if role.is_system_role do %>
-        <span class="badge badge-warning badge-sm">{gettext("System")}</span>
-      <% else %>
-        <span class="badge badge-ghost badge-sm">{gettext("Custom")}</span>
-      <% end %>
-    </:col>
-
-    <:col :let={role} label={gettext("Users")}>
-      <span class="badge badge-ghost">{get_user_count(role, @user_counts)}</span>
-    </:col>
-
-    <:action :let={role}>
-      <div class="sr-only">
-        <.link navigate={~p"/admin/roles/#{role}"}>{gettext("Show")}</.link>
-      </div>
-
-      <%= if can?(@current_user, :update, Mv.Authorization.Role) do %>
-        <.link navigate={~p"/admin/roles/#{role}/edit"} class="btn btn-ghost btn-sm">
-          <.icon name="hero-pencil" class="size-4" />
-          {gettext("Edit")}
-        </.link>
-      <% end %>
-    </:action>
-
-    <:action :let={role}>
-      <%= if can?(@current_user, :destroy, Mv.Authorization.Role) and not role.is_system_role do %>
-        <.link
-          phx-click={JS.push("delete", value: %{id: role.id}) |> hide("#row-#{role.id}")}
-          data-confirm={gettext("Are you sure?")}
-          class="btn btn-ghost btn-sm text-error"
-        >
-          <.icon name="hero-trash" class="size-4" />
-          {gettext("Delete")}
-        </.link>
-      <% else %>
-        <div
-          :if={role.is_system_role}
-          class="tooltip tooltip-left"
-          data-tip={gettext("System roles cannot be deleted")}
-        >
-          <button
-            class="btn btn-ghost btn-sm text-error opacity-50 cursor-not-allowed"
-            disabled={true}
-            aria-label={gettext("Cannot delete system role")}
-          >
-            <.icon name="hero-trash" class="size-4" />
-            {gettext("Delete")}
-          </button>
-        </div>
-      <% end %>
-    </:action>
-  </.table>
-</Layouts.app>
diff --git a/lib/mv_web/live/role_live/show.ex b/lib/mv_web/live/role_live/show.ex
deleted file mode 100644
index 7184b68..0000000
--- a/lib/mv_web/live/role_live/show.ex
+++ /dev/null
@@ -1,216 +0,0 @@
-defmodule MvWeb.RoleLive.Show do
-  @moduledoc """
-  LiveView for displaying a single role's details.
-
-  ## Features
-  - Display role information (name, description, permission_set_name, is_system_role)
-  - Navigate to edit form
-  - Return to role list
-
-  ## Security
-  Only admins can access this page (enforced by authorization).
-  """
-  use MvWeb, :live_view
-
-  alias Mv.Accounts
-
-  require Ash.Query
-
-  import MvWeb.RoleLive.Helpers,
-    only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
-
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
-  @impl true
-  def mount(%{"id" => id}, _session, socket) do
-    try do
-      case Ash.get(
-             Mv.Authorization.Role,
-             id,
-             domain: Mv.Authorization,
-             actor: socket.assigns[:current_user]
-           ) do
-        {:ok, role} ->
-          user_count = load_user_count(role, socket.assigns[:current_user])
-
-          {:ok,
-           socket
-           |> assign(:page_title, gettext("Show Role"))
-           |> assign(:role, role)
-           |> assign(:user_count, user_count)}
-
-        {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
-          {:ok,
-           socket
-           |> put_flash(:error, gettext("Role not found."))
-           |> redirect(to: ~p"/admin/roles")}
-
-        {:error, error} ->
-          {:ok,
-           socket
-           |> put_flash(:error, format_error(error))
-           |> redirect(to: ~p"/admin/roles")}
-      end
-    rescue
-      e in [Ash.Error.Invalid] ->
-        # Handle exceptions that Ash.get might throw (e.g., policy violations)
-        case e do
-          %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
-            {:ok,
-             socket
-             |> put_flash(:error, gettext("Role not found."))
-             |> redirect(to: ~p"/admin/roles")}
-
-          _ ->
-            reraise e, __STACKTRACE__
-        end
-    end
-  end
-
-  @impl true
-  def handle_event("delete", %{"id" => id}, socket) do
-    case Mv.Authorization.get_role(id, actor: socket.assigns.current_user) do
-      {:ok, role} ->
-        handle_delete_role(role, socket)
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Role not found.")
-         )
-         |> push_navigate(to: ~p"/admin/roles")}
-
-      {:error, error} ->
-        error_message = format_error(error)
-
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Failed to delete role: %{error}", error: error_message)
-         )}
-    end
-  end
-
-  defp handle_delete_role(role, socket) do
-    if role.is_system_role do
-      {:noreply,
-       put_flash(
-         socket,
-         :error,
-         gettext("System roles cannot be deleted.")
-       )}
-    else
-      user_count = recalculate_user_count(role, socket.assigns.current_user)
-
-      if user_count > 0 do
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext(
-             "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first.",
-             count: user_count
-           )
-         )}
-      else
-        perform_role_deletion(role, socket)
-      end
-    end
-  end
-
-  defp perform_role_deletion(role, socket) do
-    case Mv.Authorization.destroy_role(role, actor: socket.assigns.current_user) do
-      :ok ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("Role deleted successfully."))
-         |> push_navigate(to: ~p"/admin/roles")}
-
-      {:error, error} ->
-        error_message = format_error(error)
-
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("Failed to delete role: %{error}", error: error_message)
-         )}
-    end
-  end
-
-  # Recalculates user count for a specific role (used before deletion)
-  @spec recalculate_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
-  defp recalculate_user_count(role, actor) do
-    opts = opts_with_actor([], actor, Mv.Accounts)
-
-    case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id), opts) do
-      {:ok, count} -> count
-      _ -> 0
-    end
-  end
-
-  # Loads user count for initial display (uses same logic as recalculate)
-  @spec load_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
-  defp load_user_count(role, actor) do
-    recalculate_user_count(role, actor)
-  end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {gettext("Role")} {@role.name}
-        <:subtitle>{gettext("Role details and permissions.")}</:subtitle>
-
-        <:actions>
-          <.button navigate={~p"/admin/roles"} aria-label={gettext("Back to roles list")}>
-            <.icon name="hero-arrow-left" />
-            <span class="sr-only">{gettext("Back to roles list")}</span>
-          </.button>
-          <%= if can?(@current_user, :update, Mv.Authorization.Role) do %>
-            <.button variant="primary" navigate={~p"/admin/roles/#{@role}/edit"}>
-              <.icon name="hero-pencil-square" /> {gettext("Edit Role")}
-            </.button>
-          <% end %>
-          <%= if can?(@current_user, :destroy, Mv.Authorization.Role) and not @role.is_system_role do %>
-            <.link
-              phx-click={JS.push("delete", value: %{id: @role.id})}
-              data-confirm={gettext("Are you sure?")}
-              class="btn btn-error"
-            >
-              <.icon name="hero-trash" /> {gettext("Delete Role")}
-            </.link>
-          <% end %>
-        </:actions>
-      </.header>
-
-      <.list>
-        <:item title={gettext("Name")}>{@role.name}</:item>
-        <:item title={gettext("Description")}>
-          <%= if @role.description do %>
-            {@role.description}
-          <% else %>
-            <span class="text-base-content/70 italic">{gettext("No description")}</span>
-          <% end %>
-        </:item>
-        <:item title={gettext("Permission Set")}>
-          <span class={permission_set_badge_class(@role.permission_set_name)}>
-            {@role.permission_set_name}
-          </span>
-        </:item>
-        <:item title={gettext("System Role")}>
-          <%= if @role.is_system_role do %>
-            <span class="badge badge-warning">{gettext("Yes")}</span>
-          <% else %>
-            <span class="badge badge-ghost">{gettext("No")}</span>
-          <% end %>
-        </:item>
-      </.list>
-    </Layouts.app>
-    """
-  end
-end
diff --git a/lib/mv_web/live_helpers.ex b/lib/mv_web/live_helpers.ex
index f217ee2..3563cfe 100644
--- a/lib/mv_web/live_helpers.ex
+++ b/lib/mv_web/live_helpers.ex
@@ -4,59 +4,16 @@ defmodule MvWeb.LiveHelpers do
 
   ## on_mount Hooks
   - `:default` - Sets the user's locale from session (defaults to "de")
-  - `:ensure_user_role_loaded` - Ensures current_user has role relationship loaded
 
   ## Usage
   Add to LiveView modules via:
   ```elixir
   on_mount {MvWeb.LiveHelpers, :default}
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   ```
   """
-  import Phoenix.Component
-
   def on_mount(:default, _params, session, socket) do
     locale = session["locale"] || "de"
     Gettext.put_locale(locale)
     {:cont, socket}
   end
-
-  def on_mount(:ensure_user_role_loaded, _params, _session, socket) do
-    socket = ensure_user_role_loaded(socket)
-    {:cont, socket}
-  end
-
-  defp ensure_user_role_loaded(socket) do
-    if socket.assigns[:current_user] do
-      user = socket.assigns.current_user
-      user_with_role = load_user_role(user)
-      assign(socket, :current_user, user_with_role)
-    else
-      socket
-    end
-  end
-
-  defp load_user_role(user) do
-    case Map.get(user, :role) do
-      %Ash.NotLoaded{} -> load_role_safely(user)
-      nil -> load_role_safely(user)
-      _role -> user
-    end
-  end
-
-  defp load_role_safely(user) do
-    # Use self as actor for loading own role relationship
-    opts = [domain: Mv.Accounts, actor: user]
-
-    case Ash.load(user, :role, opts) do
-      {:ok, loaded_user} ->
-        loaded_user
-
-      {:error, error} ->
-        # Log warning if role loading fails - this can cause authorization issues
-        require Logger
-        Logger.warning("Failed to load role for user #{user.id}: #{inspect(error)}")
-        user
-    end
-  end
 end
diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex
index 682b672..9a871c9 100644
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@@ -46,10 +46,7 @@ defmodule MvWeb.Router do
     AshAuthentication-specific: We define that all routes can only be accessed when the user is signed in.
     """
     ash_authentication_live_session :authentication_required,
-      on_mount: [
-        {MvWeb.LiveUserAuth, :live_user_required},
-        {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-      ] do
+      on_mount: {MvWeb.LiveUserAuth, :live_user_required} do
       live "/", MemberLive.Index, :index
 
       live "/members", MemberLive.Index, :index
@@ -84,12 +81,6 @@ defmodule MvWeb.Router do
       live "/contribution_types", ContributionTypeLive.Index, :index
       live "/contributions/member/:id", ContributionPeriodLive.Show, :show
 
-      # Role Management (Admin only)
-      live "/admin/roles", RoleLive.Index, :index
-      live "/admin/roles/new", RoleLive.Form, :new
-      live "/admin/roles/:id", RoleLive.Show, :show
-      live "/admin/roles/:id/edit", RoleLive.Form, :edit
-
       post "/set_locale", LocaleController, :set_locale
     end
 
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index f1dc9e9..9467ed7 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -18,8 +18,6 @@ msgstr "Aktionen"
 
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
@@ -41,7 +39,6 @@ msgstr "Stadt"
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
@@ -50,8 +47,6 @@ msgstr "Löschen"
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -105,7 +100,6 @@ msgid "New Member"
 msgstr "Neues Mitglied"
 
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
@@ -173,7 +167,6 @@ msgstr "Mitglied speichern"
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -189,7 +182,6 @@ msgstr "Straße"
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
@@ -203,7 +195,6 @@ msgstr "Mitglied anzeigen"
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
@@ -263,7 +254,6 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
@@ -277,9 +267,6 @@ msgstr "Mitglied auswählen"
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -324,9 +311,6 @@ msgstr "Mitglieder"
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -431,7 +415,6 @@ msgstr "aufsteigend"
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
@@ -557,7 +540,6 @@ msgid "Search..."
 msgstr "Suchen..."
 
 #: lib/mv_web/components/layouts/navbar.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr "Benutzer*innen"
@@ -965,11 +947,10 @@ msgstr "Familie"
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr "Festgelegt nach der Erstellung. Mitglieder können nur zwischen Beitragsarten mit gleichem Intervall wechseln."
 
-#: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Global Settings"
-msgstr "Globale Einstellungen"
+msgstr "Vereinsdaten"
 
 #: lib/mv_web/helpers/membership_fee_helpers.ex
 #: lib/mv_web/live/contribution_period_live/show.ex
@@ -1437,7 +1418,6 @@ msgstr "Bereits bezahlte Zyklen bleiben mit dem alten Betrag."
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "An error occurred"
 msgstr "Ein Fehler ist aufgetreten"
@@ -1689,7 +1669,6 @@ msgid "Select interval"
 msgstr "Intervall auswählen"
 
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Art"
@@ -1835,167 +1814,82 @@ msgstr "Keine Zyklen"
 msgid "Not set"
 msgstr "Nicht gesetzt"
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Back to roles list"
-msgstr "Zurück zur Rollen-Liste"
+#~ #: lib/mv_web/live/components/payment_filter_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "All payment statuses"
+#~ msgstr "Jeder Zahlungs-Zustand"
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete system role"
-msgstr "System-Rolle kann nicht gelöscht werden"
+#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr "Automatisch generierter Bezeichner (unveränderlich)"
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Configure global settings for membership contributions."
+#~ msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit Role"
-msgstr "Bearbeiten"
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Contribution"
+#~ msgstr "Beitrag"
 
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Failed to delete role: %{error}"
-msgstr "Rolle konnte nicht gelöscht werden: %{error}"
+#~ #: lib/mv_web/components/layouts/navbar.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Contribution Settings"
+#~ msgstr "Beitragseinstellungen"
 
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Listing Roles"
-msgstr "Rollen auflisten"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy emails"
+#~ msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Manage user roles and their permission sets."
-msgstr "Verwalte Benutzer*innen-Rollen und ihre Berechtigungssätze."
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Default Contribution Type"
+#~ msgstr "Standard-Beitragsart"
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Role"
-msgstr "Neue Rolle"
+#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Edit amount"
+#~ msgstr "Betrag bearbeiten"
 
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "No description"
-msgstr "Beschreibung"
+#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Failed to delete some cycles: %{errors}"
+#~ msgstr "Konnte Feld nicht löschen: %{error}"
 
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Permission Set"
-msgstr "Berechtigungssatz"
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr "Unveränderlich"
 
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role"
-msgstr ""
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Include joining period"
+#~ msgstr "Beitrittsdatum einbeziehen"
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role details and permissions."
-msgstr "Rollen-Details und Berechtigungen."
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "New Custom field"
+#~ msgstr "Benutzerdefiniertes Feld speichern"
 
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Role"
-msgstr "Rolle speichern"
+#~ #: lib/mv_web/live/components/payment_filter_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not paid"
+#~ msgstr "Nicht bezahlt"
 
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Select permission set"
-msgstr "Berechtigungssatz auswählen"
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Payment Cycle"
+#~ msgstr "Zahlungszyklus"
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Show Role"
-msgstr "Anzeigen"
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System"
-msgstr "System"
-
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "System Role"
-msgstr "System-Rolle"
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System roles cannot be deleted"
-msgstr "System-Rollen können nicht gelöscht werden"
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use this form to manage roles in your database."
-msgstr "Verwenden Sie dieses Formular, um Rollen in Ihrer Datenbank zu verwalten."
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "admin - Unrestricted access"
-msgstr "admin - Uneingeschränkter Zugriff"
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "normal_user - Create/Read/Update access"
-msgstr "normal_user - Erstellen/Lesen/Aktualisieren Zugriff"
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "own_data - Access only to own data"
-msgstr "own_data - Zugriff nur auf eigene Daten"
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "read_only - Read access to all data"
-msgstr "read_only - Lesezugriff auf alle Daten"
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Delete Role"
-msgstr "Rolle löschen"
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role deleted successfully."
-msgstr "Rolle erfolgreich gelöscht."
-
-#: lib/mv_web/components/layouts/navbar.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Roles"
-msgstr "Rollen"
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first."
-msgstr "Rolle kann nicht gelöscht werden. %{count} Benutzer*in(nen) sind dieser Rolle noch zugeordnet. Bitte weisen Sie sie zunächst einer anderen Rolle zu."
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role not found."
-msgstr "Rolle nicht gefunden."
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Role saved successfully."
-msgstr "Rolle erfolgreich gespeichert"
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "System roles cannot be deleted."
-msgstr "System-Rollen können nicht gelöscht werden."
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Pending"
+#~ msgstr "Ausstehend"
 
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
@@ -2013,3 +1907,65 @@ msgstr "System-Rollen können nicht gelöscht werden."
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Quarterly Interval - Joining Period Excluded"
 #~ msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show Last/Current Cycle Payment Status"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show current cycle"
+#~ msgstr "Aktuellen Zyklus anzeigen"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show last completed cycle"
+#~ msgstr "Letzten abgeschlossenen Zyklus anzeigen"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to current cycle"
+#~ msgstr "Zum aktuellen Zyklus wechseln"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to last completed cycle"
+#~ msgstr "Zum letzten abgeschlossenen Zyklus wechseln"
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "This data is for demonstration purposes only (mockup)."
+#~ msgstr "Diese Daten dienen nur zu Demonstrationszwecken (Mockup)."
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in current cycle"
+#~ msgstr "Unbezahlt im aktuellen Zyklus"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in last cycle"
+#~ msgstr "Unbezahlt im letzten Zyklus"
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "View Example Member"
+#~ msgstr "Beispielmitglied anzeigen"
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Yearly Interval - Joining Period Included"
+#~ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "monthly"
+#~ msgstr "monatlich"
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "yearly"
+#~ msgstr "jährlich"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 03dad7f..77931d4 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -19,8 +19,6 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
@@ -42,7 +40,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
@@ -51,8 +48,6 @@ msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -106,7 +101,6 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
@@ -174,7 +168,6 @@ msgstr ""
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -190,7 +183,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
@@ -204,7 +196,6 @@ msgstr ""
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -264,7 +255,6 @@ msgstr ""
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
@@ -278,9 +268,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -325,9 +312,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -432,7 +416,6 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
@@ -558,7 +541,6 @@ msgid "Search..."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr ""
@@ -966,7 +948,6 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Global Settings"
@@ -1438,7 +1419,6 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "An error occurred"
 msgstr ""
@@ -1690,7 +1670,6 @@ msgid "Select interval"
 msgstr ""
 
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -1835,165 +1814,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Not set"
 msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Back to roles list"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete system role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Custom"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Edit Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Failed to delete role: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Listing Roles"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Manage user roles and their permission sets."
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "No description"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Permission Set"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role details and permissions."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Select permission set"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Show Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "System Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System roles cannot be deleted"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage roles in your database."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "admin - Unrestricted access"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "normal_user - Create/Read/Update access"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "own_data - Access only to own data"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "read_only - Read access to all data"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Delete Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role deleted successfully."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex
-#, elixir-autogen, elixir-format
-msgid "Roles"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role not found."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Role saved successfully."
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "System roles cannot be deleted."
-msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 8fd50a6..5846f7b 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -19,8 +19,6 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
@@ -42,7 +40,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
@@ -51,8 +48,6 @@ msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -106,7 +101,6 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
@@ -174,7 +168,6 @@ msgstr ""
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -190,7 +183,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
@@ -204,7 +196,6 @@ msgstr ""
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -264,7 +255,6 @@ msgstr ""
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
@@ -278,9 +268,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -325,9 +312,6 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -432,7 +416,6 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
@@ -558,7 +541,6 @@ msgid "Search..."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Users"
 msgstr ""
@@ -966,7 +948,6 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Global Settings"
@@ -1438,7 +1419,6 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
-#: lib/mv_web/live/role_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "An error occurred"
 msgstr ""
@@ -1690,7 +1670,6 @@ msgid "Select interval"
 msgstr ""
 
 #: lib/mv_web/live/member_live/show.ex
-#: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -1836,187 +1815,93 @@ msgstr ""
 msgid "Not set"
 msgstr ""
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Back to roles list"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show current cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete system role"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in last cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom"
-msgstr ""
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "New Custom field"
+#~ msgstr ""
 
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Failed to delete role: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Listing Roles"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Manage user roles and their permission sets."
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "No description"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Permission Set"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role details and permissions."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Select permission set"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Show Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "System Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "System roles cannot be deleted"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use this form to manage roles in your database."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "admin - Unrestricted access"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "normal_user - Create/Read/Update access"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "own_data - Access only to own data"
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "read_only - Read access to all data"
-msgstr ""
-
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Delete Role"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Role deleted successfully."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Roles"
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Role not found."
-msgstr ""
-
-#: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Role saved successfully."
-msgstr ""
-
-#: lib/mv_web/live/role_live/index.ex
-#: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "System roles cannot be deleted."
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show Last/Current Cycle Payment Status"
+#~ msgstr ""
 
 #~ #: lib/mv_web/live/components/payment_filter_component.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "All payment statuses"
 #~ msgstr ""
 
-#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Auto-generated identifier (immutable)"
+#~ msgid "Copy emails"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #: lib/mv_web/translations/member_fields.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Phone"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Pending"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Payment Cycle"
 #~ msgstr ""
 
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Configure global settings for membership contributions."
+#~ msgid "View Example Member"
 #~ msgstr ""
 
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Contribution"
+#~ msgid "This data is for demonstration purposes only (mockup)."
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Edit amount"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Quarterly Interval - Joining Period Excluded"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Example: Member Contribution View"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Failed to delete some cycles: %{errors}"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to current cycle"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to save settings. Please check the errors below."
 #~ msgstr ""
 
 #~ #: lib/mv_web/components/layouts/navbar.ex
@@ -2025,137 +1910,85 @@ msgstr ""
 #~ msgid "Contribution Settings"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Include joining period"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Contribution start"
 #~ msgstr ""
 
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Copy emails"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Default Contribution Type"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Example: Member Contribution View"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/membership_fee_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Failed to save settings. Please check the errors below."
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/user_live/index.html.heex
-#~ #: lib/mv_web/live/user_live/show.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Generated periods"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/custom_field_live/form_component.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Immutable"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/custom_field_live/index_component.ex
-#~ #, elixir-autogen, elixir-format, fuzzy
-#~ msgid "New Custom field"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/components/payment_filter_component.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Not paid"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/show.ex
-#~ #, elixir-autogen, elixir-format, fuzzy
-#~ msgid "Payment Cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/show.ex
-#~ #, elixir-autogen, elixir-format, fuzzy
-#~ msgid "Pending"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/form.ex
-#~ #: lib/mv_web/live/member_live/show.ex
-#~ #: lib/mv_web/translations/member_fields.ex
-#~ #, elixir-autogen, elixir-format, fuzzy
-#~ msgid "Phone"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Phone Number"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Quarterly Interval - Joining Period Excluded"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Show Last/Current Cycle Payment Status"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Show current cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Show last completed cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Switch to current cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Switch to last completed cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/form.ex
-#~ #: lib/mv_web/live/member_live/show.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "This data is for demonstration purposes only (mockup)."
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Unpaid in current cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Unpaid in last cycle"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "View Example Member"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Yearly Interval - Joining Period Included"
-#~ msgstr ""
-
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "monthly"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show last completed cycle"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/payment_filter_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not paid"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Yearly Interval - Joining Period Included"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Contribution"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Generated periods"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to last completed cycle"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Configure global settings for membership contributions."
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Default Contribution Type"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "yearly"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Phone Number"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in current cycle"
+#~ msgstr ""
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 6b23cce..4f99e5b 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -5,7 +5,6 @@
 
 alias Mv.Membership
 alias Mv.Accounts
-alias Mv.Authorization
 alias Mv.MembershipFees.MembershipFeeType
 alias Mv.MembershipFees.CycleGenerator
 
@@ -125,42 +124,9 @@ for attrs <- [
 end
 
 # Create admin user for testing
-admin_user =
-  Accounts.create_user!(%{email: "admin@mv.local"}, upsert?: true, upsert_identity: :unique_email)
-  |> Ash.Changeset.for_update(:admin_set_password, %{password: "testpassword"})
-  |> Ash.update!()
-
-# Create admin role and assign it to admin user
-admin_role =
-  case Authorization.list_roles() do
-    {:ok, roles} ->
-      case Enum.find(roles, &(&1.name == "Admin" && &1.permission_set_name == "admin")) do
-        nil ->
-          # Create admin role if it doesn't exist
-          case Authorization.create_role(%{
-                 name: "Admin",
-                 description: "Administrator with full access",
-                 permission_set_name: "admin"
-               }) do
-            {:ok, role} -> role
-            {:error, _error} -> nil
-          end
-
-        role ->
-          role
-      end
-
-    {:error, _error} ->
-      nil
-  end
-
-# Assign admin role to admin user if role was created/found
-if admin_role do
-  admin_user
-  |> Ash.Changeset.for_update(:update, %{})
-  |> Ash.Changeset.manage_relationship(:role, admin_role, type: :append_and_remove)
-  |> Ash.update!()
-end
+Accounts.create_user!(%{email: "admin@mv.local"}, upsert?: true, upsert_identity: :unique_email)
+|> Ash.Changeset.for_update(:admin_set_password, %{password: "testpassword"})
+|> Ash.update!()
 
 # Load all membership fee types for assignment
 # Sort by name to ensure deterministic order
diff --git a/test/mv/authorization/checks/has_permission_integration_test.exs b/test/mv/authorization/checks/has_permission_integration_test.exs
deleted file mode 100644
index f1f32c3..0000000
--- a/test/mv/authorization/checks/has_permission_integration_test.exs
+++ /dev/null
@@ -1,87 +0,0 @@
-defmodule Mv.Authorization.Checks.HasPermissionIntegrationTest do
-  @moduledoc """
-  Integration tests for HasPermission policy check.
-
-  These tests verify that the filter expressions generated by HasPermission
-  have the correct structure for relationship-based filtering.
-
-  Note: Full integration tests with real queries require resources to have
-  policies that use HasPermission. These tests validate filter expression
-  structure and ensure the relationship paths are correct.
-  """
-  use ExUnit.Case, async: true
-
-  alias Mv.Authorization.Checks.HasPermission
-
-  # Helper to create mock actor with role
-  defp create_actor_with_role(permission_set_name) do
-    %{
-      id: "user-#{System.unique_integer([:positive])}",
-      role: %{permission_set_name: permission_set_name}
-    }
-  end
-
-  describe "Filter Expression Structure - :linked scope" do
-    test "Member filter uses user.id relationship path" do
-      actor = create_actor_with_role("own_data")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      filter = HasPermission.auto_filter(actor, authorizer, [])
-
-      # Verify filter is not nil (should return a filter for :linked scope)
-      assert not is_nil(filter)
-
-      # The filter should be a valid expression (keyword list or Ash.Expr)
-      # We verify it's not nil and can be used in queries
-      assert is_list(filter) or is_map(filter)
-    end
-
-    test "CustomFieldValue filter uses member.user.id relationship path" do
-      actor = create_actor_with_role("own_data")
-      authorizer = create_authorizer(Mv.Membership.CustomFieldValue, :read)
-
-      filter = HasPermission.auto_filter(actor, authorizer, [])
-
-      # Verify filter is not nil
-      assert not is_nil(filter)
-
-      # The filter should be a valid expression
-      assert is_list(filter) or is_map(filter)
-    end
-  end
-
-  describe "Filter Expression Structure - :own scope" do
-    test "User filter uses id == actor.id" do
-      actor = create_actor_with_role("own_data")
-      authorizer = create_authorizer(Mv.Accounts.User, :read)
-
-      filter = HasPermission.auto_filter(actor, authorizer, [])
-
-      # Verify filter is not nil (should return a filter for :own scope)
-      assert not is_nil(filter)
-
-      # The filter should be a valid expression
-      assert is_list(filter) or is_map(filter)
-    end
-  end
-
-  describe "Filter Expression Structure - :all scope" do
-    test "Admin can read all members without filter" do
-      actor = create_actor_with_role("admin")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      filter = HasPermission.auto_filter(actor, authorizer, [])
-
-      # :all scope should return nil (no filter needed)
-      assert is_nil(filter)
-    end
-  end
-
-  # Helper to create a mock authorizer
-  defp create_authorizer(resource, action) do
-    %Ash.Policy.Authorizer{
-      resource: resource,
-      subject: %{action: %{name: action}}
-    }
-  end
-end
diff --git a/test/mv/authorization/checks/has_permission_test.exs b/test/mv/authorization/checks/has_permission_test.exs
deleted file mode 100644
index 5ab88c6..0000000
--- a/test/mv/authorization/checks/has_permission_test.exs
+++ /dev/null
@@ -1,264 +0,0 @@
-defmodule Mv.Authorization.Checks.HasPermissionTest do
-  @moduledoc """
-  Tests for the HasPermission Ash Policy Check.
-
-  This check evaluates permissions from the PermissionSets module and applies
-  scope filters to Ash queries.
-  """
-  use ExUnit.Case, async: true
-
-  alias Mv.Authorization.Checks.HasPermission
-
-  # Helper to create a mock authorizer for strict_check/3
-  defp create_authorizer(resource, action) do
-    %Ash.Policy.Authorizer{
-      resource: resource,
-      subject: %{action: %{name: action}}
-    }
-  end
-
-  # Helper to create actor with role
-  defp create_actor(id, permission_set_name) do
-    %{
-      id: id,
-      role: %{permission_set_name: permission_set_name}
-    }
-  end
-
-  describe "describe/1" do
-    test "returns human-readable description" do
-      description = HasPermission.describe([])
-      assert is_binary(description)
-      assert description =~ "permission"
-    end
-  end
-
-  describe "strict_check/3 - Permission Lookup" do
-    test "admin has permission for all resources/actions" do
-      admin = create_actor("admin-123", "admin")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(admin, authorizer, [])
-
-      assert result == true or result == :unknown
-    end
-
-    test "read_only has read permission for Member" do
-      read_only_user = create_actor("read-only-123", "read_only")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(read_only_user, authorizer, [])
-
-      assert result == true or result == :unknown
-    end
-
-    test "read_only does NOT have create permission for Member" do
-      read_only_user = create_actor("read-only-123", "read_only")
-      authorizer = create_authorizer(Mv.Membership.Member, :create)
-
-      {:ok, result} = HasPermission.strict_check(read_only_user, authorizer, [])
-
-      assert result == false
-    end
-
-    test "own_data has update permission for User with scope :own" do
-      own_data_user = create_actor("user-123", "own_data")
-      authorizer = create_authorizer(Mv.Accounts.User, :update)
-
-      {:ok, result} = HasPermission.strict_check(own_data_user, authorizer, [])
-
-      # Should return :unknown for :own scope (needs filter)
-      assert result == :unknown
-    end
-  end
-
-  describe "strict_check/3 - Scope :all" do
-    test "actor with scope :all can access any record" do
-      admin = create_actor("admin-123", "admin")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(admin, authorizer, [])
-
-      # :all scope should return true (no filter needed)
-      assert result == true
-    end
-
-    test "admin can read all members without filter" do
-      admin = create_actor("admin-123", "admin")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(admin, authorizer, [])
-
-      # Should return true for :all scope
-      assert result == true
-    end
-  end
-
-  describe "strict_check/3 - Scope :own" do
-    test "actor with scope :own returns :unknown (needs filter)" do
-      user = create_actor("user-123", "own_data")
-      authorizer = create_authorizer(Mv.Accounts.User, :read)
-
-      {:ok, result} = HasPermission.strict_check(user, authorizer, [])
-
-      # Should return :unknown for :own scope (needs filter via auto_filter)
-      assert result == :unknown
-    end
-  end
-
-  describe "auto_filter/3 - Scope :own" do
-    test "scope :own returns filter expression" do
-      user = create_actor("user-123", "own_data")
-      authorizer = create_authorizer(Mv.Accounts.User, :update)
-
-      filter = HasPermission.auto_filter(user, authorizer, [])
-
-      # Should return a filter expression
-      assert not is_nil(filter)
-    end
-  end
-
-  describe "auto_filter/3 - Scope :linked" do
-    test "scope :linked for Member returns user_id filter" do
-      user = create_actor("user-123", "own_data")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      filter = HasPermission.auto_filter(user, authorizer, [])
-
-      # Should return a filter expression
-      assert not is_nil(filter)
-    end
-
-    test "scope :linked for CustomFieldValue returns member.user_id filter" do
-      user = create_actor("user-123", "own_data")
-      authorizer = create_authorizer(Mv.Membership.CustomFieldValue, :update)
-
-      filter = HasPermission.auto_filter(user, authorizer, [])
-
-      # Should return a filter expression that traverses member relationship
-      assert not is_nil(filter)
-    end
-  end
-
-  describe "strict_check/3 - Error Handling" do
-    test "returns {:ok, false} for nil actor" do
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(nil, authorizer, [])
-
-      assert result == false
-    end
-
-    test "returns {:ok, false} for actor missing role" do
-      actor_without_role = %{id: "user-123"}
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(actor_without_role, authorizer, [])
-
-      assert result == false
-    end
-
-    test "returns {:ok, false} for actor with nil role" do
-      actor_with_nil_role = %{id: "user-123", role: nil}
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(actor_with_nil_role, authorizer, [])
-
-      assert result == false
-    end
-
-    test "returns {:ok, false} for invalid permission_set_name" do
-      actor_with_invalid_permission = %{
-        id: "user-123",
-        role: %{permission_set_name: "invalid_set"}
-      }
-
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(actor_with_invalid_permission, authorizer, [])
-
-      assert result == false
-    end
-
-    test "returns {:ok, false} for no matching permission" do
-      read_only_user = create_actor("read-only-123", "read_only")
-      authorizer = create_authorizer(Mv.Authorization.Role, :create)
-
-      {:ok, result} = HasPermission.strict_check(read_only_user, authorizer, [])
-
-      assert result == false
-    end
-
-    test "handles role with nil permission_set_name gracefully" do
-      actor_with_nil_permission_set = %{
-        id: "user-123",
-        role: %{permission_set_name: nil}
-      }
-
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(actor_with_nil_permission_set, authorizer, [])
-
-      assert result == false
-    end
-  end
-
-  describe "strict_check/3 - Logging" do
-    import ExUnit.CaptureLog
-
-    test "logs authorization failure for nil actor" do
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      log =
-        capture_log(fn ->
-          HasPermission.strict_check(nil, authorizer, [])
-        end)
-
-      assert log =~ "Authorization failed" or log == ""
-    end
-
-    test "logs authorization failure for missing role" do
-      actor_without_role = %{id: "user-123"}
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      log =
-        capture_log(fn ->
-          HasPermission.strict_check(actor_without_role, authorizer, [])
-        end)
-
-      assert log =~ "Authorization failed" or log == ""
-    end
-  end
-
-  describe "strict_check/3 - Resource Name Extraction" do
-    test "correctly extracts resource name from nested module" do
-      admin = create_actor("admin-123", "admin")
-      authorizer = create_authorizer(Mv.Membership.Member, :read)
-
-      {:ok, result} = HasPermission.strict_check(admin, authorizer, [])
-
-      # Should work correctly (not crash)
-      assert result == true or result == :unknown or result == false
-    end
-
-    test "works with different resource modules" do
-      admin = create_actor("admin-123", "admin")
-
-      resources = [
-        Mv.Accounts.User,
-        Mv.Membership.Member,
-        Mv.Membership.CustomFieldValue,
-        Mv.Membership.CustomField,
-        Mv.Authorization.Role
-      ]
-
-      for resource <- resources do
-        authorizer = create_authorizer(resource, :read)
-        {:ok, result} = HasPermission.strict_check(admin, authorizer, [])
-
-        # Should not crash and should return valid result
-        assert result == true or result == :unknown or result == false
-      end
-    end
-  end
-end
diff --git a/test/mv_web/authorization_test.exs b/test/mv_web/authorization_test.exs
deleted file mode 100644
index 17bbe4b..0000000
--- a/test/mv_web/authorization_test.exs
+++ /dev/null
@@ -1,219 +0,0 @@
-defmodule MvWeb.AuthorizationTest do
-  @moduledoc """
-  Tests for UI-level authorization helpers.
-  """
-  use ExUnit.Case, async: true
-
-  alias MvWeb.Authorization
-  alias Mv.Membership.Member
-  alias Mv.Accounts.User
-
-  describe "can?/3 with resource atom" do
-    test "returns true when user has permission for resource+action" do
-      admin = %{
-        id: "admin-123",
-        role: %{permission_set_name: "admin"}
-      }
-
-      assert Authorization.can?(admin, :create, Mv.Membership.Member) == true
-      assert Authorization.can?(admin, :read, Mv.Membership.Member) == true
-      assert Authorization.can?(admin, :update, Mv.Membership.Member) == true
-      assert Authorization.can?(admin, :destroy, Mv.Membership.Member) == true
-    end
-
-    test "returns false when user lacks permission" do
-      read_only_user = %{
-        id: "read-only-123",
-        role: %{permission_set_name: "read_only"}
-      }
-
-      assert Authorization.can?(read_only_user, :create, Mv.Membership.Member) == false
-      assert Authorization.can?(read_only_user, :read, Mv.Membership.Member) == true
-      assert Authorization.can?(read_only_user, :update, Mv.Membership.Member) == false
-      assert Authorization.can?(read_only_user, :destroy, Mv.Membership.Member) == false
-    end
-
-    test "returns false for nil user" do
-      assert Authorization.can?(nil, :create, Mv.Membership.Member) == false
-      assert Authorization.can?(nil, :read, Mv.Membership.Member) == false
-    end
-
-    test "admin can manage roles" do
-      admin = %{
-        id: "admin-123",
-        role: %{permission_set_name: "admin"}
-      }
-
-      assert Authorization.can?(admin, :create, Mv.Authorization.Role) == true
-      assert Authorization.can?(admin, :read, Mv.Authorization.Role) == true
-      assert Authorization.can?(admin, :update, Mv.Authorization.Role) == true
-      assert Authorization.can?(admin, :destroy, Mv.Authorization.Role) == true
-    end
-
-    test "non-admin cannot manage roles" do
-      normal_user = %{
-        id: "normal-123",
-        role: %{permission_set_name: "normal_user"}
-      }
-
-      assert Authorization.can?(normal_user, :create, Mv.Authorization.Role) == false
-      assert Authorization.can?(normal_user, :read, Mv.Authorization.Role) == false
-      assert Authorization.can?(normal_user, :update, Mv.Authorization.Role) == false
-      assert Authorization.can?(normal_user, :destroy, Mv.Authorization.Role) == false
-    end
-  end
-
-  describe "can?/3 with record struct - scope :all" do
-    test "admin can update any member" do
-      admin = %{
-        id: "admin-123",
-        role: %{permission_set_name: "admin"}
-      }
-
-      member1 = %Member{id: "member-1", user: %User{id: "other-user"}}
-      member2 = %Member{id: "member-2", user: %User{id: "another-user"}}
-
-      assert Authorization.can?(admin, :update, member1) == true
-      assert Authorization.can?(admin, :update, member2) == true
-    end
-
-    test "normal_user can update any member" do
-      normal_user = %{
-        id: "normal-123",
-        role: %{permission_set_name: "normal_user"}
-      }
-
-      member = %Member{id: "member-1", user: %User{id: "other-user"}}
-
-      assert Authorization.can?(normal_user, :update, member) == true
-    end
-  end
-
-  describe "can?/3 with record struct - scope :own" do
-    test "user can update own User record" do
-      user = %{
-        id: "user-123",
-        role: %{permission_set_name: "own_data"}
-      }
-
-      own_user_record = %User{id: "user-123"}
-      other_user_record = %User{id: "other-user"}
-
-      assert Authorization.can?(user, :update, own_user_record) == true
-      assert Authorization.can?(user, :update, other_user_record) == false
-    end
-  end
-
-  describe "can?/3 with record struct - scope :linked" do
-    test "user can update linked member" do
-      user = %{
-        id: "user-123",
-        role: %{permission_set_name: "own_data"}
-      }
-
-      # Member has_one :user (inverse relationship)
-      linked_member = %Member{id: "member-1", user: %User{id: "user-123"}}
-      unlinked_member = %Member{id: "member-2", user: nil}
-      unlinked_member_other = %Member{id: "member-3", user: %User{id: "other-user"}}
-
-      assert Authorization.can?(user, :update, linked_member) == true
-      assert Authorization.can?(user, :update, unlinked_member) == false
-      assert Authorization.can?(user, :update, unlinked_member_other) == false
-    end
-
-    test "user can update CustomFieldValue of linked member" do
-      user = %{
-        id: "user-123",
-        role: %{permission_set_name: "own_data"}
-      }
-
-      linked_cfv = %Mv.Membership.CustomFieldValue{
-        id: "cfv-1",
-        member: %Member{id: "member-1", user: %User{id: "user-123"}}
-      }
-
-      unlinked_cfv = %Mv.Membership.CustomFieldValue{
-        id: "cfv-2",
-        member: %Member{id: "member-2", user: nil}
-      }
-
-      unlinked_cfv_other = %Mv.Membership.CustomFieldValue{
-        id: "cfv-3",
-        member: %Member{id: "member-3", user: %User{id: "other-user"}}
-      }
-
-      assert Authorization.can?(user, :update, linked_cfv) == true
-      assert Authorization.can?(user, :update, unlinked_cfv) == false
-      assert Authorization.can?(user, :update, unlinked_cfv_other) == false
-    end
-  end
-
-  describe "can_access_page?/2" do
-    test "admin can access all pages via wildcard" do
-      admin = %{
-        id: "admin-123",
-        role: %{permission_set_name: "admin"}
-      }
-
-      assert Authorization.can_access_page?(admin, "/admin/roles") == true
-      assert Authorization.can_access_page?(admin, "/members") == true
-      assert Authorization.can_access_page?(admin, "/any/page") == true
-    end
-
-    test "read_only user can access allowed pages" do
-      read_only_user = %{
-        id: "read-only-123",
-        role: %{permission_set_name: "read_only"}
-      }
-
-      assert Authorization.can_access_page?(read_only_user, "/") == true
-      assert Authorization.can_access_page?(read_only_user, "/members") == true
-      assert Authorization.can_access_page?(read_only_user, "/members/123") == true
-      assert Authorization.can_access_page?(read_only_user, "/admin/roles") == false
-    end
-
-    test "matches dynamic routes correctly" do
-      read_only_user = %{
-        id: "read-only-123",
-        role: %{permission_set_name: "read_only"}
-      }
-
-      assert Authorization.can_access_page?(read_only_user, "/members/123") == true
-      assert Authorization.can_access_page?(read_only_user, "/members/abc") == true
-      assert Authorization.can_access_page?(read_only_user, "/members/123/edit") == false
-    end
-
-    test "returns false for nil user" do
-      assert Authorization.can_access_page?(nil, "/members") == false
-      assert Authorization.can_access_page?(nil, "/admin/roles") == false
-    end
-  end
-
-  describe "error handling" do
-    test "user without role returns false" do
-      user_without_role = %{id: "user-123", role: nil}
-
-      assert Authorization.can?(user_without_role, :create, Mv.Membership.Member) == false
-      assert Authorization.can_access_page?(user_without_role, "/members") == false
-    end
-
-    test "user with invalid permission_set_name returns false" do
-      user_with_invalid_permission = %{
-        id: "user-123",
-        role: %{permission_set_name: "invalid_set"}
-      }
-
-      assert Authorization.can?(user_with_invalid_permission, :create, Mv.Membership.Member) ==
-               false
-
-      assert Authorization.can_access_page?(user_with_invalid_permission, "/members") == false
-    end
-
-    test "handles missing fields gracefully" do
-      user_missing_role = %{id: "user-123"}
-
-      assert Authorization.can?(user_missing_role, :create, Mv.Membership.Member) == false
-      assert Authorization.can_access_page?(user_missing_role, "/members") == false
-    end
-  end
-end
diff --git a/test/mv_web/live/role_live_test.exs b/test/mv_web/live/role_live_test.exs
deleted file mode 100644
index 792cbac..0000000
--- a/test/mv_web/live/role_live_test.exs
+++ /dev/null
@@ -1,452 +0,0 @@
-defmodule MvWeb.RoleLiveTest do
-  @moduledoc """
-  Tests for role management LiveViews.
-  """
-  use MvWeb.ConnCase, async: false
-
-  import Phoenix.LiveViewTest
-
-  alias Mv.Authorization
-  alias Mv.Authorization.Role
-
-  # Helper to create a role
-  defp create_role(attrs \\ %{}) do
-    default_attrs = %{
-      name: "Test Role #{System.unique_integer([:positive])}",
-      description: "Test description",
-      permission_set_name: "read_only"
-    }
-
-    attrs = Map.merge(default_attrs, attrs)
-
-    case Authorization.create_role(attrs) do
-      {:ok, role} -> role
-      {:error, error} -> raise "Failed to create role: #{inspect(error)}"
-    end
-  end
-
-  # Helper to create admin user with admin role
-  defp create_admin_user(conn) do
-    # Create admin role
-    admin_role =
-      case Authorization.list_roles() do
-        {:ok, roles} ->
-          case Enum.find(roles, &(&1.name == "Admin")) do
-            nil ->
-              # Create admin role if it doesn't exist
-              create_role(%{
-                name: "Admin",
-                description: "Administrator with full access",
-                permission_set_name: "admin"
-              })
-
-            role ->
-              role
-          end
-
-        _ ->
-          # Create admin role if list_roles fails
-          create_role(%{
-            name: "Admin",
-            description: "Administrator with full access",
-            permission_set_name: "admin"
-          })
-      end
-
-    # Create user
-    {:ok, user} =
-      Mv.Accounts.User
-      |> Ash.Changeset.for_create(:register_with_password, %{
-        email: "admin#{System.unique_integer([:positive])}@mv.local",
-        password: "testpassword123"
-      })
-      |> Ash.create()
-
-    # Assign admin role using manage_relationship
-    {:ok, user} =
-      user
-      |> Ash.Changeset.for_update(:update, %{})
-      |> Ash.Changeset.manage_relationship(:role, admin_role, type: :append_and_remove)
-      |> Ash.update()
-
-    # Load role for authorization checks (must be loaded for can?/3 to work)
-    user_with_role = Ash.load!(user, :role, domain: Mv.Accounts)
-
-    # Store user with role in session for LiveView
-    conn = conn_with_password_user(conn, user_with_role)
-    {conn, user_with_role, admin_role}
-  end
-
-  # Helper to create non-admin user
-  defp create_non_admin_user(conn) do
-    {:ok, user} =
-      Mv.Accounts.User
-      |> Ash.Changeset.for_create(:register_with_password, %{
-        email: "user#{System.unique_integer([:positive])}@mv.local",
-        password: "testpassword123"
-      })
-      |> Ash.create()
-
-    conn = conn_with_password_user(conn, user)
-    {conn, user}
-  end
-
-  describe "index page" do
-    setup %{conn: conn} do
-      {conn, user, _admin_role} = create_admin_user(conn)
-      %{conn: conn, user: user}
-    end
-
-    test "mounts successfully", %{conn: conn} do
-      {:ok, _view, _html} = live(conn, "/admin/roles")
-    end
-
-    test "loads all roles from database", %{conn: conn} do
-      role1 = create_role(%{name: "Role 1"})
-      role2 = create_role(%{name: "Role 2"})
-
-      {:ok, _view, html} = live(conn, "/admin/roles")
-
-      assert html =~ role1.name
-      assert html =~ role2.name
-    end
-
-    test "shows table with role names", %{conn: conn} do
-      role = create_role(%{name: "Test Role"})
-
-      {:ok, _view, html} = live(conn, "/admin/roles")
-
-      assert html =~ role.name
-      assert html =~ role.description
-      assert html =~ role.permission_set_name
-    end
-
-    test "shows system role badge", %{conn: conn} do
-      _system_role =
-        Role
-        |> Ash.Changeset.for_create(:create_role, %{
-          name: "System Role",
-          permission_set_name: "own_data"
-        })
-        |> Ash.Changeset.force_change_attribute(:is_system_role, true)
-        |> Ash.create!()
-
-      {:ok, _view, html} = live(conn, "/admin/roles")
-
-      assert html =~ "System Role" || html =~ "system"
-    end
-
-    test "delete button disabled for system roles", %{conn: conn} do
-      system_role =
-        Role
-        |> Ash.Changeset.for_create(:create_role, %{
-          name: "System Role",
-          permission_set_name: "own_data"
-        })
-        |> Ash.Changeset.force_change_attribute(:is_system_role, true)
-        |> Ash.create!()
-
-      {:ok, view, _html} = live(conn, "/admin/roles")
-
-      assert has_element?(
-               view,
-               "button[phx-click='delete'][phx-value-id='#{system_role.id}'][disabled]"
-             ) ||
-               not has_element?(
-                 view,
-                 "button[phx-click='delete'][phx-value-id='#{system_role.id}']"
-               )
-    end
-
-    test "delete button enabled for non-system roles", %{conn: conn} do
-      role = create_role()
-
-      {:ok, view, html} = live(conn, "/admin/roles")
-
-      # Delete is a link with phx-click containing delete event
-      # Check if delete link exists in HTML (phx-click contains delete and role id)
-      assert (html =~ "phx-click" && html =~ "delete" && html =~ role.id) ||
-               has_element?(view, "a[phx-click*='delete'][phx-value-id='#{role.id}']") ||
-               has_element?(view, "a[aria-label='Delete role']")
-    end
-
-    test "new role button navigates to form", %{conn: conn} do
-      {:ok, view, html} = live(conn, "/admin/roles")
-
-      # Check if button exists (admin should see it)
-      if html =~ "New Role" do
-        {:error, {:live_redirect, %{to: to}}} =
-          view
-          |> element("a[href='/admin/roles/new'], button[href='/admin/roles/new']")
-          |> render_click()
-
-        assert to == "/admin/roles/new"
-      else
-        # If button not visible, user doesn't have permission (expected for non-admin)
-        # This test assumes admin user, so button should be visible
-        flunk("New Role button not found - user may not have admin role loaded")
-      end
-    end
-  end
-
-  describe "show page" do
-    setup %{conn: conn} do
-      {conn, user, _admin_role} = create_admin_user(conn)
-      %{conn: conn, user: user}
-    end
-
-    test "mounts with valid role ID", %{conn: conn} do
-      role = create_role()
-
-      {:ok, _view, html} = live(conn, "/admin/roles/#{role.id}")
-
-      assert html =~ role.name
-      assert html =~ role.description
-      assert html =~ role.permission_set_name
-    end
-
-    test "returns 404 for invalid role ID", %{conn: conn} do
-      invalid_id = Ecto.UUID.generate()
-
-      # Should redirect to index with error message
-      # redirect in mount returns {:error, {:redirect, ...}}
-      result = live(conn, "/admin/roles/#{invalid_id}")
-
-      assert match?({:error, {:redirect, %{to: "/admin/roles"}}}, result)
-    end
-
-    test "shows system role badge if is_system_role is true", %{conn: conn} do
-      system_role =
-        Role
-        |> Ash.Changeset.for_create(:create_role, %{
-          name: "System Role",
-          permission_set_name: "own_data"
-        })
-        |> Ash.Changeset.force_change_attribute(:is_system_role, true)
-        |> Ash.create!()
-
-      {:ok, _view, html} = live(conn, "/admin/roles/#{system_role.id}")
-
-      assert html =~ "System Role" || html =~ "system"
-    end
-  end
-
-  describe "form - create" do
-    setup %{conn: conn} do
-      {conn, user, _admin_role} = create_admin_user(conn)
-      %{conn: conn, user: user}
-    end
-
-    test "mounts successfully", %{conn: conn} do
-      {:ok, _view, _html} = live(conn, "/admin/roles/new")
-    end
-
-    test "form dropdown shows all 4 permission sets", %{conn: conn} do
-      {:ok, _view, html} = live(conn, "/admin/roles/new")
-
-      assert html =~ "own_data"
-      assert html =~ "read_only"
-      assert html =~ "normal_user"
-      assert html =~ "admin"
-    end
-
-    test "creates new role with valid data", %{conn: conn} do
-      {:ok, view, _html} = live(conn, "/admin/roles/new")
-
-      attrs = %{
-        "name" => "New Role",
-        "description" => "New description",
-        "permission_set_name" => "read_only"
-      }
-
-      view
-      |> form("#role-form", role: attrs)
-      |> render_submit()
-
-      # Should redirect to index or show page
-      assert_redirect(view, "/admin/roles")
-    end
-
-    test "shows error with invalid permission_set_name", %{conn: conn} do
-      {:ok, view, _html} = live(conn, "/admin/roles/new")
-
-      # Try to submit with empty permission_set_name (invalid)
-      attrs = %{
-        "name" => "New Role",
-        "description" => "New description",
-        "permission_set_name" => ""
-      }
-
-      view
-      |> form("#role-form", role: attrs)
-      |> render_submit()
-
-      # Should show validation error
-      html = render(view)
-      assert html =~ "error" || html =~ "required" || html =~ "Permission Set"
-    end
-
-    test "shows flash message after successful creation", %{conn: conn} do
-      {:ok, view, _html} = live(conn, "/admin/roles/new")
-
-      attrs = %{
-        "name" => "New Role #{System.unique_integer([:positive])}",
-        "description" => "New description",
-        "permission_set_name" => "read_only"
-      }
-
-      view
-      |> form("#role-form", role: attrs)
-      |> render_submit()
-
-      # Should redirect to index
-      assert_redirect(view, "/admin/roles")
-    end
-  end
-
-  describe "form - edit" do
-    setup %{conn: conn} do
-      {conn, user, _admin_role} = create_admin_user(conn)
-      role = create_role()
-      %{conn: conn, user: user, role: role}
-    end
-
-    test "mounts with valid role ID", %{conn: conn, role: role} do
-      {:ok, _view, html} = live(conn, "/admin/roles/#{role.id}/edit")
-
-      assert html =~ role.name
-    end
-
-    test "returns 404 for invalid role ID in edit", %{conn: conn} do
-      invalid_id = Ecto.UUID.generate()
-
-      # Should redirect to index with error message
-      # redirect in mount returns {:error, {:redirect, ...}}
-      result = live(conn, "/admin/roles/#{invalid_id}/edit")
-
-      assert match?({:error, {:redirect, %{to: "/admin/roles"}}}, result)
-    end
-
-    test "updates role name", %{conn: conn, role: role} do
-      {:ok, view, _html} = live(conn, "/admin/roles/#{role.id}/edit?return_to=show")
-
-      attrs = %{
-        "name" => "Updated Role Name",
-        "description" => role.description,
-        "permission_set_name" => role.permission_set_name
-      }
-
-      view
-      |> form("#role-form", role: attrs)
-      |> render_submit()
-
-      assert_redirect(view, "/admin/roles/#{role.id}")
-
-      # Verify update
-      {:ok, updated_role} = Authorization.get_role(role.id)
-      assert updated_role.name == "Updated Role Name"
-    end
-
-    test "updates system role's permission_set_name", %{conn: conn} do
-      system_role =
-        Role
-        |> Ash.Changeset.for_create(:create_role, %{
-          name: "System Role",
-          permission_set_name: "own_data"
-        })
-        |> Ash.Changeset.force_change_attribute(:is_system_role, true)
-        |> Ash.create!()
-
-      {:ok, view, _html} = live(conn, "/admin/roles/#{system_role.id}/edit?return_to=show")
-
-      attrs = %{
-        "name" => system_role.name,
-        "description" => system_role.description,
-        "permission_set_name" => "read_only"
-      }
-
-      view
-      |> form("#role-form", role: attrs)
-      |> render_submit()
-
-      assert_redirect(view, "/admin/roles/#{system_role.id}")
-
-      # Verify update
-      {:ok, updated_role} = Authorization.get_role(system_role.id)
-      assert updated_role.permission_set_name == "read_only"
-    end
-  end
-
-  describe "delete functionality" do
-    setup %{conn: conn} do
-      {conn, user, _admin_role} = create_admin_user(conn)
-      %{conn: conn, user: user}
-    end
-
-    test "deletes non-system role", %{conn: conn} do
-      role = create_role()
-
-      {:ok, view, html} = live(conn, "/admin/roles")
-
-      # Delete is a link - JS.push creates phx-click with value containing id
-      # Verify the role id is in the HTML (in phx-click value)
-      assert html =~ role.id
-
-      # Send delete event directly to avoid selector issues with multiple delete buttons
-      render_click(view, "delete", %{"id" => role.id})
-
-      # Verify deletion by checking database
-      assert {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{}]}} =
-               Authorization.get_role(role.id)
-    end
-
-    test "fails to delete system role with error message", %{conn: conn} do
-      system_role =
-        Role
-        |> Ash.Changeset.for_create(:create_role, %{
-          name: "System Role",
-          permission_set_name: "own_data"
-        })
-        |> Ash.Changeset.force_change_attribute(:is_system_role, true)
-        |> Ash.create!()
-
-      {:ok, view, html} = live(conn, "/admin/roles")
-
-      # System role delete button should be disabled
-      assert html =~ "disabled" || html =~ "cursor-not-allowed" ||
-               html =~ "System roles cannot be deleted"
-
-      # Try to delete via event (backend check)
-      render_click(view, "delete", %{"id" => system_role.id})
-
-      # Should show error message
-      assert render(view) =~ "System roles cannot be deleted"
-
-      # Role should still exist
-      {:ok, _role} = Authorization.get_role(system_role.id)
-    end
-  end
-
-  describe "authorization" do
-    test "only admin can access /admin/roles", %{conn: conn} do
-      {conn, _user} = create_non_admin_user(conn)
-
-      # Non-admin should be redirected or see error
-      # Note: Authorization is checked via can_access_page? which returns false
-      # The page might still mount but show no content or redirect
-      # For now, we just verify the page doesn't work as expected for non-admin
-      {:ok, _view, html} = live(conn, "/admin/roles")
-
-      # Non-admin should not see "New Role" button (can? returns false)
-      # But the button might still be in HTML, just hidden or disabled
-      # We verify that the page loads but admin features are restricted
-      assert html =~ "Listing Roles" || html =~ "Roles"
-    end
-
-    test "admin can access /admin/roles", %{conn: conn} do
-      {conn, _user, _admin_role} = create_admin_user(conn)
-
-      {:ok, _view, _html} = live(conn, "/admin/roles")
-    end
-  end
-end