diff --git a/frontend/src/e2e-test/pages/mobile/staff-page.ts b/frontend/src/e2e-test/pages/mobile/staff-page.ts
index 8f12350864c..27c8ae050f7 100644
--- a/frontend/src/e2e-test/pages/mobile/staff-page.ts
+++ b/frontend/src/e2e-test/pages/mobile/staff-page.ts
@@ -20,91 +20,6 @@ import {
   TextInput
 } from '../../utils/page'
 
-export default class StaffPage {
-  #staffCount: Element
-  #staffOtherCount: Element
-  #cancelButton: Element
-  #confirmButton: Element
-  #occupancyRealized: Element
-  #updated: Element
-  constructor(readonly page: Page) {
-    this.#staffCount = page.findByDataQa('staff-count')
-    this.#staffOtherCount = page.findByDataQa('staff-other-count')
-    this.#cancelButton = page.findByDataQa('cancel-button')
-    this.#confirmButton = page.findByDataQa('confirm-button')
-    this.#occupancyRealized = page.findByDataQa('realized-occupancy')
-    this.#updated = page.findByDataQa('updated')
-  }
-
-  private countButton(parent: Element, which: 'plus' | 'minus') {
-    return parent.find(`[data-qa="${which}-button"]`)
-  }
-
-  get staffCount() {
-    return this.#staffCount.find('[data-qa="value"]').text
-  }
-
-  get staffOtherCount() {
-    return this.#staffOtherCount.find('[data-qa="value"]').text
-  }
-
-  async incDecButtonsVisible(): Promise<boolean[]> {
-    return Promise.all(
-      [this.#staffCount, this.#staffOtherCount]
-        .map((parent) =>
-          (['plus', 'minus'] as const).map((which) =>
-            this.countButton(parent, which)
-          )
-        )
-        .flat()
-        .map((el) => el.visible)
-    )
-  }
-
-  async incStaffCount() {
-    return this.countButton(this.#staffCount, 'plus').click()
-  }
-
-  async decStaffCount() {
-    return this.countButton(this.#staffCount, 'minus').click()
-  }
-
-  async incStaffOtherCount() {
-    return this.countButton(this.#staffOtherCount, 'plus').click()
-  }
-
-  async decStaffOtherCount() {
-    return this.countButton(this.#staffOtherCount, 'minus').click()
-  }
-
-  async cancel() {
-    return this.#cancelButton.click()
-  }
-
-  async confirm() {
-    return this.#confirmButton.click()
-  }
-
-  get buttonsDisabled() {
-    return Promise.all([
-      this.#cancelButton.disabled,
-      this.#confirmButton.disabled
-    ]).then(([cancel, confirm]) => cancel && confirm)
-  }
-
-  get buttonsEnabled() {
-    return this.buttonsDisabled.then((disabled) => !disabled)
-  }
-
-  get updated() {
-    return this.#updated.text
-  }
-
-  get occupancy() {
-    return this.#occupancyRealized.text
-  }
-}
-
 export class StaffAttendancePage {
   editButton: Element
   previousAttendancesButton: Element
diff --git a/frontend/src/e2e-test/specs/6_mobile/staff.spec.ts b/frontend/src/e2e-test/specs/6_mobile/staff.spec.ts
deleted file mode 100644
index 18a4bb583aa..00000000000
--- a/frontend/src/e2e-test/specs/6_mobile/staff.spec.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import HelsinkiDateTime from 'lib-common/helsinki-date-time'
-
-import {
-  testDaycareGroup,
-  Fixture,
-  familyWithTwoGuardians,
-  testDaycare,
-  testCareArea
-} from '../../dev-api/fixtures'
-import {
-  createDefaultServiceNeedOptions,
-  resetServiceState
-} from '../../generated/api-clients'
-import MobileNav from '../../pages/mobile/mobile-nav'
-import StaffPage from '../../pages/mobile/staff-page'
-import { waitUntilEqual, waitUntilTrue } from '../../utils'
-import { pairMobileDevice } from '../../utils/mobile'
-import { Page } from '../../utils/page'
-
-let page: Page
-let nav: MobileNav
-let staffPage: StaffPage
-let mobileSignupUrl: string
-
-const now = HelsinkiDateTime.of(2023, 3, 15, 12, 0)
-const today = now.toLocalDate()
-
-beforeEach(async () => {
-  await resetServiceState()
-  await Fixture.careArea(testCareArea).save()
-  await Fixture.daycare(testDaycare).save()
-  await Fixture.family(familyWithTwoGuardians).save()
-  await createDefaultServiceNeedOptions()
-
-  await Fixture.daycareGroup(testDaycareGroup).save()
-  const daycarePlacementFixture = await Fixture.placement({
-    childId: familyWithTwoGuardians.children[0].id,
-    unitId: testDaycare.id,
-    startDate: today,
-    endDate: today.addYears(1)
-  }).save()
-  await Fixture.groupPlacement({
-    daycarePlacementId: daycarePlacementFixture.id,
-    daycareGroupId: testDaycareGroup.id,
-    startDate: today,
-    endDate: today.addYears(1)
-  }).save()
-
-  page = await Page.open({ mockedTime: now })
-  nav = new MobileNav(page)
-
-  mobileSignupUrl = await pairMobileDevice(testDaycare.id)
-  await page.goto(mobileSignupUrl)
-  await nav.staff.click()
-  staffPage = new StaffPage(page)
-})
-
-describe('Staff page', () => {
-  test('Staff for all groups is read-only', async () => {
-    await waitUntilEqual(() => staffPage.staffCount, '0')
-    await waitUntilEqual(() => staffPage.staffOtherCount, '0')
-    await waitUntilEqual(() => staffPage.updated, 'Tietoja ei ole päivitetty')
-
-    await waitUntilEqual(
-      () => staffPage.incDecButtonsVisible(),
-      [false, false, false, false]
-    )
-  })
-
-  test('Set group staff', async () => {
-    await nav.selectGroup(testDaycareGroup.id)
-    await waitUntilEqual(() => staffPage.staffCount, '0')
-    await waitUntilEqual(() => staffPage.staffOtherCount, '0')
-    await waitUntilEqual(() => staffPage.updated, 'Tietoja ei ole päivitetty')
-
-    await staffPage.incStaffCount()
-    await staffPage.incStaffCount()
-    await staffPage.incStaffCount()
-    await waitUntilEqual(() => staffPage.staffCount, '1,5')
-    await staffPage.incStaffOtherCount()
-    await waitUntilEqual(() => staffPage.staffOtherCount, '0,5')
-    await staffPage.confirm()
-
-    await waitUntilEqual(
-      () => staffPage.occupancy,
-      'Ryhmän käyttöaste tänään 9,5 %'
-    )
-    await waitUntilTrue(async () =>
-      (await staffPage.updated).startsWith('Tiedot päivitetty tänään ')
-    )
-  })
-
-  test('Cancel resets the form', async () => {
-    await nav.selectGroup(testDaycareGroup.id)
-    await staffPage.incStaffCount()
-    await staffPage.confirm()
-
-    await staffPage.incStaffCount()
-    await staffPage.incStaffOtherCount()
-    await staffPage.cancel()
-
-    await waitUntilEqual(() => staffPage.staffCount, '0,5')
-    await waitUntilEqual(() => staffPage.staffOtherCount, '0')
-  })
-
-  test('Button state', async () => {
-    await nav.selectGroup(testDaycareGroup.id)
-    await waitUntilTrue(() => staffPage.buttonsDisabled)
-
-    await staffPage.incStaffCount()
-    await waitUntilTrue(() => staffPage.buttonsEnabled)
-
-    await staffPage.decStaffCount()
-    await waitUntilTrue(() => staffPage.buttonsDisabled)
-
-    await staffPage.incStaffOtherCount()
-    await waitUntilTrue(() => staffPage.buttonsEnabled)
-
-    await staffPage.decStaffOtherCount()
-    await waitUntilTrue(() => staffPage.buttonsDisabled)
-  })
-})
diff --git a/frontend/src/employee-frontend/components/absences/StaffAttendance.tsx b/frontend/src/employee-frontend/components/absences/StaffAttendance.tsx
index 1854ce26267..dd0a5f445b1 100755
--- a/frontend/src/employee-frontend/components/absences/StaffAttendance.tsx
+++ b/frontend/src/employee-frontend/components/absences/StaffAttendance.tsx
@@ -65,8 +65,7 @@ export default React.memo(function StaffAttendance({
         body: {
           groupId,
           date,
-          count,
-          countOther: null
+          count
         }
       }),
     [groupId]
diff --git a/frontend/src/employee-mobile-frontend/App.tsx b/frontend/src/employee-mobile-frontend/App.tsx
index 28a678720b0..9677c51d685 100755
--- a/frontend/src/employee-mobile-frontend/App.tsx
+++ b/frontend/src/employee-mobile-frontend/App.tsx
@@ -61,7 +61,6 @@ import PairingWizard from './pairing/PairingWizard'
 import { queryClient, QueryClientProvider } from './query'
 import { RememberContext, RememberContextProvider } from './remember'
 import { SettingsPage } from './settings/SettingsPage'
-import StaffPage from './staff/StaffPage'
 import ExternalStaffMemberPage from './staff-attendance/ExternalStaffMemberPage'
 import MarkExternalStaffMemberArrivalPage from './staff-attendance/MarkExternalStaffMemberArrivalPage'
 import StaffAttendanceEditPage from './staff-attendance/StaffAttendanceEditPage'
@@ -212,10 +211,6 @@ function GroupRouter({ unitId }: { unitId: DaycareId }) {
           path="child-attendance/*"
           element={<ChildAttendanceRouter unitOrGroup={unitOrGroup} />}
         />
-        <Route
-          path="staff/*"
-          element={<StaffRouter unitOrGroup={unitOrGroup} />}
-        />
         <Route
           path="staff-attendance/*"
           element={<StaffAttendanceRouter unitOrGroup={unitOrGroup} />}
@@ -305,14 +300,6 @@ function ChildRouter({ unitId }: { unitId: DaycareId }) {
   )
 }
 
-function StaffRouter({ unitOrGroup }: { unitOrGroup: UnitOrGroup }) {
-  return (
-    <Routes>
-      <Route index element={<StaffPage unitOrGroup={unitOrGroup} />} />
-    </Routes>
-  )
-}
-
 function StaffAttendanceRouter({ unitOrGroup }: { unitOrGroup: UnitOrGroup }) {
   return (
     <Routes>
@@ -449,9 +436,6 @@ export const routes = {
   childSensitiveInfo(unitId: UUID, child: UUID): Uri {
     return uri`${this.child(unitId, child)}/info`
   },
-  staff(unitOrGroup: UnitOrGroup): Uri {
-    return uri`${this.unitOrGroup(unitOrGroup)}/staff`
-  },
   staffAttendanceRoot(unitOrGroup: UnitOrGroup): Uri {
     return uri`${this.unitOrGroup(unitOrGroup)}/staff-attendance`
   },
diff --git a/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx b/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx
index 9cf952a1938..508e4894689 100644
--- a/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx
+++ b/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx
@@ -140,26 +140,23 @@ export default function BottomNavbar({
               />
             </BottomText>
           </Button>
-          <Button data-qa="bottomnav-staff">
-            <BottomText
-              text={i18n.common.staff}
-              selected={selected === 'staff'}
-              onClick={() =>
-                selected !== 'staff' &&
-                navigate(
-                  (unit.features.includes('REALTIME_STAFF_ATTENDANCE')
-                    ? routes.staffAttendances(unitOrGroup, 'absent')
-                    : routes.staff(unitOrGroup)
-                  ).value
-                )
-              }
-            >
-              <CustomIcon
-                icon={selected === 'staff' ? fasUser : faUser}
+          {unit.features.includes('REALTIME_STAFF_ATTENDANCE') ? (
+            <Button data-qa="bottomnav-staff">
+              <BottomText
+                text={i18n.common.staff}
                 selected={selected === 'staff'}
-              />
-            </BottomText>
-          </Button>
+                onClick={() =>
+                  selected !== 'staff' &&
+                  navigate(routes.staffAttendances(unitOrGroup, 'absent').value)
+                }
+              >
+                <CustomIcon
+                  icon={selected === 'staff' ? fasUser : faUser}
+                  selected={selected === 'staff'}
+                />
+              </BottomText>
+            </Button>
+          ) : null}
           {unit.features.includes('MOBILE_MESSAGING') ? (
             <Button data-qa="bottomnav-messages">
               <BottomText
diff --git a/frontend/src/employee-mobile-frontend/generated/api-clients/daycare.ts b/frontend/src/employee-mobile-frontend/generated/api-clients/daycare.ts
deleted file mode 100644
index ca9e3d5a032..00000000000
--- a/frontend/src/employee-mobile-frontend/generated/api-clients/daycare.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2024 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// GENERATED FILE: no manual modifications
-
-import { DaycareId } from 'lib-common/generated/api-types/shared'
-import { GroupId } from 'lib-common/generated/api-types/shared'
-import { JsonCompatible } from 'lib-common/json'
-import { JsonOf } from 'lib-common/json'
-import { StaffAttendanceUpdate } from 'lib-common/generated/api-types/daycare'
-import { UnitStaffAttendance } from 'lib-common/generated/api-types/daycare'
-import { client } from '../../client'
-import { deserializeJsonUnitStaffAttendance } from 'lib-common/generated/api-types/daycare'
-import { uri } from 'lib-common/uri'
-
-
-/**
-* Generated from fi.espoo.evaka.daycare.controllers.StaffAttendanceController.getAttendancesByUnit
-*/
-export async function getAttendancesByUnit(
-  request: {
-    unitId: DaycareId
-  }
-): Promise<UnitStaffAttendance> {
-  const { data: json } = await client.request<JsonOf<UnitStaffAttendance>>({
-    url: uri`/employee-mobile/staff-attendances/unit/${request.unitId}`.toString(),
-    method: 'GET'
-  })
-  return deserializeJsonUnitStaffAttendance(json)
-}
-
-
-/**
-* Generated from fi.espoo.evaka.daycare.controllers.StaffAttendanceController.upsertStaffAttendance
-*/
-export async function upsertStaffAttendance(
-  request: {
-    groupId: GroupId,
-    body: StaffAttendanceUpdate
-  }
-): Promise<void> {
-  const { data: json } = await client.request<JsonOf<void>>({
-    url: uri`/employee-mobile/staff-attendances/group/${request.groupId}`.toString(),
-    method: 'POST',
-    data: request.body satisfies JsonCompatible<StaffAttendanceUpdate>
-  })
-  return json
-}
diff --git a/frontend/src/employee-mobile-frontend/generated/api-clients/occupancy.ts b/frontend/src/employee-mobile-frontend/generated/api-clients/occupancy.ts
deleted file mode 100644
index 13f83fff8bb..00000000000
--- a/frontend/src/employee-mobile-frontend/generated/api-clients/occupancy.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2024 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// GENERATED FILE: no manual modifications
-
-import LocalDate from 'lib-common/local-date'
-import { DaycareId } from 'lib-common/generated/api-types/shared'
-import { JsonOf } from 'lib-common/json'
-import { OccupancyResponse } from 'lib-common/generated/api-types/occupancy'
-import { OccupancyResponseGroupLevel } from 'lib-common/generated/api-types/occupancy'
-import { OccupancyType } from 'lib-common/generated/api-types/occupancy'
-import { client } from '../../client'
-import { createUrlSearchParams } from 'lib-common/api'
-import { deserializeJsonOccupancyResponse } from 'lib-common/generated/api-types/occupancy'
-import { deserializeJsonOccupancyResponseGroupLevel } from 'lib-common/generated/api-types/occupancy'
-import { uri } from 'lib-common/uri'
-
-
-/**
-* Generated from fi.espoo.evaka.occupancy.OccupancyController.getOccupancyPeriods
-*/
-export async function getOccupancyPeriods(
-  request: {
-    unitId: DaycareId,
-    from: LocalDate,
-    to: LocalDate,
-    type: OccupancyType
-  }
-): Promise<OccupancyResponse> {
-  const params = createUrlSearchParams(
-    ['from', request.from.formatIso()],
-    ['to', request.to.formatIso()],
-    ['type', request.type.toString()]
-  )
-  const { data: json } = await client.request<JsonOf<OccupancyResponse>>({
-    url: uri`/employee-mobile/occupancy/by-unit/${request.unitId}`.toString(),
-    method: 'GET',
-    params
-  })
-  return deserializeJsonOccupancyResponse(json)
-}
-
-
-/**
-* Generated from fi.espoo.evaka.occupancy.OccupancyController.getOccupancyPeriodsOnGroups
-*/
-export async function getOccupancyPeriodsOnGroups(
-  request: {
-    unitId: DaycareId,
-    from: LocalDate,
-    to: LocalDate,
-    type: OccupancyType
-  }
-): Promise<OccupancyResponseGroupLevel[]> {
-  const params = createUrlSearchParams(
-    ['from', request.from.formatIso()],
-    ['to', request.to.formatIso()],
-    ['type', request.type.toString()]
-  )
-  const { data: json } = await client.request<JsonOf<OccupancyResponseGroupLevel[]>>({
-    url: uri`/employee-mobile/occupancy/by-unit/${request.unitId}/groups`.toString(),
-    method: 'GET',
-    params
-  })
-  return json.map(e => deserializeJsonOccupancyResponseGroupLevel(e))
-}
diff --git a/frontend/src/employee-mobile-frontend/staff/PlusMinus.tsx b/frontend/src/employee-mobile-frontend/staff/PlusMinus.tsx
deleted file mode 100644
index d5dd9d19d3c..00000000000
--- a/frontend/src/employee-mobile-frontend/staff/PlusMinus.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import React from 'react'
-import styled from 'styled-components'
-
-import { formatDecimal } from 'lib-common/utils/number'
-import { BigNumber } from 'lib-components/typography'
-import colors from 'lib-customizations/common'
-
-interface Props {
-  editable: boolean
-  value: number
-  disabled?: boolean
-  onPlus?: () => void
-  onMinus?: () => void
-  'data-qa'?: string
-}
-
-export default function PlusMinus({
-  editable,
-  value,
-  disabled,
-  onPlus,
-  onMinus,
-  'data-qa': dataQa
-}: Props) {
-  const str = formatDecimal(value)
-  return (
-    <Root data-qa={dataQa}>
-      {editable && (
-        <TextButton
-          disabled={disabled}
-          onClick={onMinus}
-          data-qa="minus-button"
-        >
-          -
-        </TextButton>
-      )}
-      <Value centered data-qa="value">
-        {str}
-      </Value>
-      {editable && (
-        <TextButton disabled={disabled} onClick={onPlus} data-qa="plus-button">
-          +
-        </TextButton>
-      )}
-    </Root>
-  )
-}
-
-const Root = styled.div`
-  color: ${colors.main.m1};
-  display: flex;
-  justify-content: center;
-`
-
-const Value = styled(BigNumber)`
-  flex: 0 1 148px;
-`
-
-const TextButton = styled.button`
-  border: none;
-  outline: none;
-  background-color: transparent;
-  font-size: 48px;
-  color: ${colors.main.m1};
-`
diff --git a/frontend/src/employee-mobile-frontend/staff/StaffAttendanceEditor.tsx b/frontend/src/employee-mobile-frontend/staff/StaffAttendanceEditor.tsx
deleted file mode 100644
index 1ed2686f612..00000000000
--- a/frontend/src/employee-mobile-frontend/staff/StaffAttendanceEditor.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import React, { useCallback, useState } from 'react'
-import styled from 'styled-components'
-
-import { Result } from 'lib-common/api'
-import { StaffAttendanceUpdate } from 'lib-common/generated/api-types/daycare'
-import { GroupId } from 'lib-common/generated/api-types/shared'
-import HelsinkiDateTime from 'lib-common/helsinki-date-time'
-import LocalDate from 'lib-common/local-date'
-import LocalTime from 'lib-common/local-time'
-import { formatDecimal } from 'lib-common/utils/number'
-import { AsyncButton } from 'lib-components/atoms/buttons/AsyncButton'
-import { LegacyButton } from 'lib-components/atoms/buttons/LegacyButton'
-import { FixedSpaceRow } from 'lib-components/layout/flex-helpers'
-import { fontWeights, H2, H4 } from 'lib-components/typography'
-import { Gap } from 'lib-components/white-space'
-import colors from 'lib-customizations/common'
-
-import { Translations, useTranslation } from '../common/i18n'
-
-import PlusMinus from './PlusMinus'
-
-export interface Props {
-  groupId: GroupId | undefined
-  date: LocalDate
-  count: number
-  countOther: number
-  updated: HelsinkiDateTime | null
-  realizedOccupancy: number | undefined
-  onConfirm: (value: StaffAttendanceUpdate) => Promise<Result<void>>
-}
-
-export default React.memo(function StaffAttendanceEditor({
-  groupId,
-  date,
-  count,
-  countOther,
-  updated,
-  realizedOccupancy,
-  onConfirm
-}: Props) {
-  const { i18n } = useTranslation()
-
-  const [saving, setSaving] = useState(false)
-  const [staff, setStaff] = useState(count)
-  const [staffOther, setStaffOther] = useState(countOther)
-
-  const editable = groupId !== undefined
-  const changed = staff !== count || staffOther !== countOther
-
-  const reset = useCallback(() => {
-    setStaff(count)
-    setStaffOther(countOther)
-  }, [count, countOther])
-
-  return (
-    <>
-      <H2
-        centered
-        smaller
-        primary
-        // Hack to make it fit to the content area
-        style={{ marginLeft: -8, marginRight: -8 }}
-      >
-        {i18n.staff.title}
-      </H2>
-      <Subtitle>{i18n.staff.daycareResponsible}</Subtitle>
-      <PlusMinus
-        editable={editable}
-        value={staff}
-        onMinus={dec(staff, setStaff)}
-        onPlus={inc(staff, setStaff)}
-        disabled={saving}
-        data-qa="staff-count"
-      />
-      <Gap size="s" />
-      <Subtitle>{i18n.staff.other}</Subtitle>
-      <PlusMinus
-        editable={editable}
-        value={staffOther}
-        onMinus={dec(staffOther, setStaffOther)}
-        onPlus={inc(staffOther, setStaffOther)}
-        disabled={saving}
-        data-qa="staff-other-count"
-      />
-      <Gap size="s" />
-      {!!groupId && (
-        <>
-          <FixedSpaceRow justifyContent="center">
-            <CancelButton
-              text={i18n.staff.cancel}
-              onClick={reset}
-              disabled={!changed || saving}
-              data-qa="cancel-button"
-            />
-            <ConfirmButton
-              text={i18n.common.confirm}
-              primary
-              disabled={!changed || saving}
-              onClick={() => {
-                setSaving(true)
-                return onConfirm({
-                  groupId,
-                  date,
-                  count: staff,
-                  countOther: staffOther
-                })
-              }}
-              onSuccess={() => {
-                setSaving(false)
-              }}
-              data-qa="confirm-button"
-            />
-          </FixedSpaceRow>
-          <Gap size="m" />
-        </>
-      )}
-      <FixedSpaceRow justifyContent="center">
-        <H4 noMargin data-qa="updated">
-          {updatedTime(i18n, updated)}
-        </H4>
-      </FixedSpaceRow>
-      <Gap size="s" />
-      <FixedSpaceRow justifyContent="center">
-        <H4 noMargin data-qa="realized-occupancy">
-          {groupId
-            ? i18n.staff.realizedGroupOccupancy
-            : i18n.staff.realizedUnitOccupancy}{' '}
-          {realizedOccupancy === undefined
-            ? '-'
-            : `${formatDecimal(realizedOccupancy)} %`}
-        </H4>
-      </FixedSpaceRow>
-    </>
-  )
-})
-
-const inc = (value: number, setValue: (newValue: number) => void) => (): void =>
-  setValue(value + 0.5)
-
-const dec =
-  (value: number, setValue: (newValue: number) => void) => (): void =>
-    value > 0 ? setValue(value - 0.5) : undefined
-
-const Subtitle = styled.h2`
-  font-style: normal;
-  font-weight: ${fontWeights.semibold};
-  font-size: 16px;
-  line-height: 24px;
-  margin: 0;
-  color: ${colors.grayscale.g100};
-  text-align: center;
-`
-
-const CancelButton = styled(LegacyButton)`
-  width: 172px;
-  padding: 0;
-`
-const ConfirmButton = styled(AsyncButton)`
-  width: 172px;
-  padding: 0;
-`
-
-function updatedTime(
-  i18n: Translations,
-  date: HelsinkiDateTime | null
-): string {
-  if (!date) return i18n.staff.notUpdated
-  const yesterday = HelsinkiDateTime.now().toLocalDate().subDays(1)
-  const endOfYesterday = HelsinkiDateTime.fromLocal(yesterday, LocalTime.MAX)
-  if (date.isEqualOrBefore(endOfYesterday)) {
-    return `${i18n.staff.updated} ${date.toLocalDate().format()}`
-  } else {
-    return `${i18n.staff.updatedToday} ${date.toLocalTime().format()}`
-  }
-}
diff --git a/frontend/src/employee-mobile-frontend/staff/StaffPage.tsx b/frontend/src/employee-mobile-frontend/staff/StaffPage.tsx
deleted file mode 100644
index b82da94756b..00000000000
--- a/frontend/src/employee-mobile-frontend/staff/StaffPage.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import React, { useCallback, useMemo } from 'react'
-import { useNavigate } from 'react-router'
-
-import { combine, Success, wrapResult } from 'lib-common/api'
-import { GroupInfo } from 'lib-common/generated/api-types/attendance'
-import { StaffAttendanceUpdate } from 'lib-common/generated/api-types/daycare'
-import LocalDate from 'lib-common/local-date'
-import { useQueryResult } from 'lib-common/query'
-import { useApiState } from 'lib-common/utils/useRestApi'
-import { ContentArea } from 'lib-components/layout/Container'
-
-import { routes } from '../App'
-import { renderResult } from '../async-rendering'
-import { PageWithNavigation } from '../common/PageWithNavigation'
-import { toUnitOrGroup, UnitOrGroup } from '../common/unit-or-group'
-import {
-  getAttendancesByUnit,
-  upsertStaffAttendance
-} from '../generated/api-clients/daycare'
-import { unitInfoQuery } from '../units/queries'
-
-import StaffAttendanceEditor from './StaffAttendanceEditor'
-import { getRealizedOccupancyToday } from './api'
-import { staffAttendanceForGroupOrUnit } from './utils'
-
-const getAttendancesByUnitResult = wrapResult(getAttendancesByUnit)
-const upsertStaffAttendanceResult = wrapResult(upsertStaffAttendance)
-
-export default React.memo(function StaffPage({
-  unitOrGroup
-}: {
-  unitOrGroup: UnitOrGroup
-}) {
-  const navigate = useNavigate()
-
-  const unitId = unitOrGroup.unitId
-  const unitInfoResponse = useQueryResult(unitInfoQuery({ unitId }))
-
-  const selectedGroup = useMemo(
-    () =>
-      unitOrGroup.type === 'unit'
-        ? undefined
-        : unitInfoResponse
-            .map((res) => res.groups.find((g) => g.id === unitOrGroup.id))
-            .getOrElse(undefined),
-    [unitOrGroup, unitInfoResponse]
-  )
-
-  const [staffResponse, reloadStaff] = useApiState(
-    () => getAttendancesByUnitResult({ unitId }),
-    [unitId]
-  )
-
-  const unitOrGroupStaffAttendance = useMemo(
-    () =>
-      staffResponse.map((staffAttendances) =>
-        staffAttendanceForGroupOrUnit(staffAttendances, selectedGroup?.id)
-      ),
-    [selectedGroup?.id, staffResponse]
-  )
-
-  const [occupancy, reloadRealizedOccupancyToday] = useApiState(
-    () => getRealizedOccupancyToday(unitId, selectedGroup?.id),
-    [unitId, selectedGroup]
-  )
-
-  const changeGroup = useCallback(
-    (group: GroupInfo | undefined) => {
-      void navigate(routes.staff(toUnitOrGroup(unitId, group?.id)).value)
-    },
-    [navigate, unitId]
-  )
-
-  const updateAttendance = useCallback(
-    async (attendance: StaffAttendanceUpdate) => {
-      await upsertStaffAttendanceResult({
-        groupId: attendance.groupId,
-        body: attendance
-      })
-      void reloadStaff()
-      void reloadRealizedOccupancyToday()
-      return Success.of()
-    },
-    [reloadRealizedOccupancyToday, reloadStaff]
-  )
-
-  const today = useMemo(() => LocalDate.todayInSystemTz(), [])
-
-  return (
-    <PageWithNavigation
-      unitOrGroup={unitOrGroup}
-      selected="staff"
-      selectedGroup={selectedGroup}
-      onChangeGroup={changeGroup}
-    >
-      <ContentArea opaque style={{ height: '100%' }}>
-        {renderResult(
-          combine(unitOrGroupStaffAttendance, occupancy),
-          ([staffAttendance, occupancy]) => (
-            <StaffAttendanceEditor
-              // Force re-render if the selected group changes
-              key={selectedGroup?.id}
-              groupId={selectedGroup?.id}
-              date={today}
-              count={staffAttendance.count}
-              countOther={staffAttendance.countOther}
-              updated={staffAttendance.updated}
-              realizedOccupancy={occupancy}
-              onConfirm={updateAttendance}
-            />
-          )
-        )}
-      </ContentArea>
-    </PageWithNavigation>
-  )
-})
diff --git a/frontend/src/employee-mobile-frontend/staff/api.ts b/frontend/src/employee-mobile-frontend/staff/api.ts
deleted file mode 100644
index 63934d61072..00000000000
--- a/frontend/src/employee-mobile-frontend/staff/api.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import {
-  getOccupancyPeriods,
-  getOccupancyPeriodsOnGroups
-} from 'employee-mobile-frontend/generated/api-clients/occupancy'
-import { Result, wrapResult } from 'lib-common/api'
-import { DaycareId } from 'lib-common/generated/api-types/shared'
-import LocalDate from 'lib-common/local-date'
-
-const getOccupancyPeriodsResult = wrapResult(getOccupancyPeriods)
-const getOccupancyPeriodsOnGroupsResult = wrapResult(
-  getOccupancyPeriodsOnGroups
-)
-export async function getRealizedOccupancyToday(
-  unitId: DaycareId,
-  groupId: string | undefined
-): Promise<Result<number>> {
-  const today = LocalDate.todayInSystemTz()
-  if (groupId) {
-    return (
-      await getOccupancyPeriodsOnGroupsResult({
-        unitId,
-        from: today,
-        to: today,
-        type: 'REALIZED'
-      })
-    ).map((response) => {
-      // There's only one occupancy, because we only fetch today's occupancy, so we can use `min`
-      const percentage = response.find((group) => group.groupId === groupId)
-        ?.occupancies.min?.percentage
-      return percentage ?? 0
-    })
-  } else {
-    return (
-      await getOccupancyPeriodsResult({
-        unitId,
-        from: today,
-        to: today,
-        type: 'REALIZED'
-      })
-    ).map((response) => response.min?.percentage ?? 0)
-  }
-}
diff --git a/frontend/src/employee-mobile-frontend/staff/utils.ts b/frontend/src/employee-mobile-frontend/staff/utils.ts
deleted file mode 100644
index 1308432c9cc..00000000000
--- a/frontend/src/employee-mobile-frontend/staff/utils.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import { UnitStaffAttendance } from 'lib-common/generated/api-types/daycare'
-import HelsinkiDateTime from 'lib-common/helsinki-date-time'
-import { UUID } from 'lib-common/types'
-
-export interface AttendanceValues {
-  count: number
-  countOther: number
-  updated: HelsinkiDateTime | null
-}
-
-export function staffAttendanceForGroupOrUnit(
-  unitStaffAttendance: UnitStaffAttendance,
-  groupId: UUID | undefined
-): AttendanceValues {
-  if (groupId === undefined) {
-    // Return unit's combined attendance
-    return {
-      count: unitStaffAttendance.count,
-      countOther: unitStaffAttendance.countOther,
-      updated: unitStaffAttendance.updated
-    }
-  } else {
-    const groupAttendance = unitStaffAttendance.groups.find(
-      (group) => group.groupId === groupId
-    )
-    return groupAttendance
-      ? {
-          count: groupAttendance.count,
-          countOther: groupAttendance.countOther,
-          updated: groupAttendance.updated
-        }
-      : {
-          count: 0,
-          countOther: 0,
-          updated: null
-        }
-  }
-}
diff --git a/frontend/src/employee-mobile-frontend/units/UnitList.tsx b/frontend/src/employee-mobile-frontend/units/UnitList.tsx
index 2c58fcd16ba..9d12cffb347 100644
--- a/frontend/src/employee-mobile-frontend/units/UnitList.tsx
+++ b/frontend/src/employee-mobile-frontend/units/UnitList.tsx
@@ -52,7 +52,6 @@ export default React.memo(function UnitList() {
                   presentChildren,
                   totalChildren,
                   presentStaff,
-                  presentStaffOther,
                   totalStaff,
                   utilization
                 }) => (
@@ -72,11 +71,7 @@ export default React.memo(function UnitList() {
                         </div>
                         <div>
                           <Stat data-qa="staff-count">
-                            {presentStaff}
-                            {presentStaffOther ? (
-                              <OtherStaff>+{presentStaffOther}</OtherStaff>
-                            ) : null}
-                            /{totalStaff}
+                            {presentStaff}/{totalStaff}
                           </Stat>
                           <StatDesc>{i18n.units.staff}</StatDesc>
                         </div>
@@ -128,10 +123,6 @@ const Stat = styled.div`
   color: ${colors.grayscale.g100};
 `
 
-const OtherStaff = styled.span`
-  color: ${colors.grayscale.g70};
-`
-
 const StatDesc = styled.div`
   color: ${colors.grayscale.g70};
   font-weight: ${fontWeights.semibold};
diff --git a/frontend/src/lib-common/generated/api-types/attendance.ts b/frontend/src/lib-common/generated/api-types/attendance.ts
index c4b08031a3e..8f01692498f 100644
--- a/frontend/src/lib-common/generated/api-types/attendance.ts
+++ b/frontend/src/lib-common/generated/api-types/attendance.ts
@@ -436,7 +436,6 @@ export interface UnitStats {
   name: string
   presentChildren: number
   presentStaff: number
-  presentStaffOther: number
   totalChildren: number
   totalStaff: number
   utilization: number
diff --git a/frontend/src/lib-common/generated/api-types/daycare.ts b/frontend/src/lib-common/generated/api-types/daycare.ts
index b9e43d35b18..44a3d8391aa 100644
--- a/frontend/src/lib-common/generated/api-types/daycare.ts
+++ b/frontend/src/lib-common/generated/api-types/daycare.ts
@@ -368,7 +368,6 @@ export interface GroupOccupancies {
 */
 export interface GroupStaffAttendance {
   count: number
-  countOther: number
   date: LocalDate
   groupId: GroupId
   updated: HelsinkiDateTime
@@ -475,7 +474,6 @@ export interface StaffAttendanceForDates {
 */
 export interface StaffAttendanceUpdate {
   count: number | null
-  countOther: number | null
   date: LocalDate
   groupId: GroupId
 }
@@ -526,17 +524,6 @@ export interface UnitNotifications {
   groups: number
 }
 
-/**
-* Generated from fi.espoo.evaka.daycare.service.UnitStaffAttendance
-*/
-export interface UnitStaffAttendance {
-  count: number
-  countOther: number
-  date: LocalDate
-  groups: GroupStaffAttendance[]
-  updated: HelsinkiDateTime | null
-}
-
 /**
 * Generated from fi.espoo.evaka.daycare.UnitStub
 */
@@ -806,13 +793,3 @@ export function deserializeJsonUnitGroupDetails(json: JsonOf<UnitGroupDetails>):
     recentlyTerminatedPlacements: json.recentlyTerminatedPlacements.map(e => deserializeJsonTerminatedPlacement(e))
   }
 }
-
-
-export function deserializeJsonUnitStaffAttendance(json: JsonOf<UnitStaffAttendance>): UnitStaffAttendance {
-  return {
-    ...json,
-    date: LocalDate.parseIso(json.date),
-    groups: json.groups.map(e => deserializeJsonGroupStaffAttendance(e)),
-    updated: (json.updated != null) ? HelsinkiDateTime.parseIso(json.updated) : null
-  }
-}
diff --git a/frontend/src/lib-common/generated/api-types/occupancy.ts b/frontend/src/lib-common/generated/api-types/occupancy.ts
index 0d8656aa6e9..bd451bdbad2 100644
--- a/frontend/src/lib-common/generated/api-types/occupancy.ts
+++ b/frontend/src/lib-common/generated/api-types/occupancy.ts
@@ -68,14 +68,6 @@ export interface OccupancyResponse {
   occupancies: OccupancyPeriod[]
 }
 
-/**
-* Generated from fi.espoo.evaka.occupancy.OccupancyResponseGroupLevel
-*/
-export interface OccupancyResponseGroupLevel {
-  groupId: GroupId
-  occupancies: OccupancyResponse
-}
-
 /**
 * Generated from fi.espoo.evaka.occupancy.OccupancyResponseSpeculated
 */
@@ -196,14 +188,6 @@ export function deserializeJsonOccupancyResponse(json: JsonOf<OccupancyResponse>
 }
 
 
-export function deserializeJsonOccupancyResponseGroupLevel(json: JsonOf<OccupancyResponseGroupLevel>): OccupancyResponseGroupLevel {
-  return {
-    ...json,
-    occupancies: deserializeJsonOccupancyResponse(json.occupancies)
-  }
-}
-
-
 export function deserializeJsonRealtimeOccupancy(json: JsonOf<RealtimeOccupancy>): RealtimeOccupancy {
   return {
     ...json,
diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclControllerIntegrationTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclControllerIntegrationTest.kt
index 78300687ecd..5a574ec4245 100644
--- a/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclControllerIntegrationTest.kt
+++ b/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclControllerIntegrationTest.kt
@@ -9,16 +9,20 @@ import com.github.kittinunf.fuel.core.isSuccessful
 import com.github.kittinunf.fuel.jackson.responseObject
 import fi.espoo.evaka.FullApplicationTest
 import fi.espoo.evaka.attendance.getOccupancyCoefficientsByUnit
+import fi.espoo.evaka.pairing.listPersonalDevices
 import fi.espoo.evaka.pis.TemporaryEmployee
 import fi.espoo.evaka.pis.controllers.PinCode
 import fi.espoo.evaka.pis.deactivateInactiveEmployees
 import fi.espoo.evaka.shared.DaycareId
 import fi.espoo.evaka.shared.EmployeeId
 import fi.espoo.evaka.shared.GroupId
+import fi.espoo.evaka.shared.async.AsyncJob
+import fi.espoo.evaka.shared.async.AsyncJobRunner
 import fi.espoo.evaka.shared.auth.*
 import fi.espoo.evaka.shared.dev.DevDaycare
 import fi.espoo.evaka.shared.dev.DevDaycareGroup
 import fi.espoo.evaka.shared.dev.DevEmployee
+import fi.espoo.evaka.shared.dev.DevPersonalMobileDevice
 import fi.espoo.evaka.shared.dev.insert
 import fi.espoo.evaka.shared.domain.EvakaClock
 import fi.espoo.evaka.shared.domain.HelsinkiDateTime
@@ -43,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired
 
 class UnitAclControllerIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
     @Autowired private lateinit var unitAclController: UnitAclController
+    @Autowired private lateinit var asyncJobRunner: AsyncJobRunner<AsyncJob>
     private val employee =
         DaycareAclRowEmployee(
             id = EmployeeId(UUID.randomUUID()),
@@ -271,6 +276,52 @@ class UnitAclControllerIntegrationTest : FullApplicationTest(resetDbBeforeEach =
         assertEquals(MessageAccountState.INACTIVE_ACCOUNT, employeeMessageAccountState())
     }
 
+    @Test
+    fun `personal mobile device is deleted in async job after supervisor role is removed`() {
+        val supervisor1 = DevEmployee()
+        val device1 = DevPersonalMobileDevice(employeeId = supervisor1.id)
+        val supervisor2 = DevEmployee()
+        val device2 = DevPersonalMobileDevice(employeeId = supervisor2.id)
+        db.transaction { tx ->
+            tx.insert(supervisor1, unitRoles = mapOf(testDaycare.id to UserRole.UNIT_SUPERVISOR))
+            tx.insert(device1)
+            tx.insert(
+                supervisor2,
+                unitRoles =
+                    mapOf(
+                        testDaycare.id to UserRole.UNIT_SUPERVISOR,
+                        testDaycare2.id to UserRole.UNIT_SUPERVISOR,
+                    ),
+            )
+            tx.insert(device2)
+        }
+
+        val now = HelsinkiDateTime.of(LocalDate.of(2024, 12, 13), LocalTime.of(12, 0))
+        unitAclController.deleteUnitSupervisor(
+            dbInstance(),
+            admin,
+            MockEvakaClock(now),
+            testDaycare.id,
+            supervisor1.id,
+        )
+        unitAclController.deleteUnitSupervisor(
+            dbInstance(),
+            admin,
+            MockEvakaClock(now),
+            testDaycare.id,
+            supervisor2.id,
+        )
+        asyncJobRunner.runPendingJobsSync(MockEvakaClock(now.plusHours(1)))
+
+        db.read { tx ->
+            assertEquals(emptyList(), tx.listPersonalDevices(employeeId = supervisor1.id))
+            assertEquals(
+                listOf(device2.id),
+                tx.listPersonalDevices(employeeId = supervisor2.id).map { it.id },
+            )
+        }
+    }
+
     @Test
     fun temporaryEmployeeCrud() {
         val dateTime = HelsinkiDateTime.of(LocalDate.of(2023, 3, 29), LocalTime.of(8, 37))
diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceServiceIntegrationTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceServiceIntegrationTest.kt
index e24f8458ba5..6977032fbf7 100644
--- a/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceServiceIntegrationTest.kt
+++ b/service/src/integrationTest/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceServiceIntegrationTest.kt
@@ -78,7 +78,7 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
         val attendanceDate = groupStartDate
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 1.0, 0.5),
+            StaffAttendanceUpdate(groupId, attendanceDate, 1.0),
         )
 
         val result =
@@ -91,28 +91,6 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
 
         assertEquals(1, result.attendances.size)
         assertEquals(1.0, result.attendances[attendanceDate]?.count)
-        assertEquals(0.5, result.attendances[attendanceDate]?.countOther)
-    }
-
-    @Test
-    fun `creating an attendance with null countOther sets countOther to 0`() {
-        val attendanceDate = groupStartDate
-        staffAttendanceService.upsertStaffAttendance(
-            db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 1.0, null),
-        )
-
-        val result =
-            staffAttendanceService.getGroupAttendancesByMonth(
-                db,
-                attendanceDate.year,
-                attendanceDate.monthValue,
-                groupId,
-            )
-
-        assertEquals(1, result.attendances.size)
-        assertEquals(1.0, result.attendances[attendanceDate]?.count)
-        assertEquals(0.0, result.attendances[attendanceDate]?.countOther)
     }
 
     @Test
@@ -120,40 +98,7 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
         val attendanceDate = groupStartDate
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 1.0, 0.5),
-        )
-
-        var result =
-            staffAttendanceService.getGroupAttendancesByMonth(
-                db,
-                attendanceDate.year,
-                attendanceDate.monthValue,
-                groupId,
-            )
-        assertEquals(1.0, result.attendances[attendanceDate]?.count)
-        assertEquals(0.5, result.attendances[attendanceDate]?.countOther)
-
-        staffAttendanceService.upsertStaffAttendance(
-            db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 2.5, 0.0),
-        )
-        result =
-            staffAttendanceService.getGroupAttendancesByMonth(
-                db,
-                attendanceDate.year,
-                attendanceDate.monthValue,
-                groupId,
-            )
-        assertEquals(2.5, result.attendances[attendanceDate]?.count)
-        assertEquals(0.0, result.attendances[attendanceDate]?.countOther)
-    }
-
-    @Test
-    fun `modifying attendance with null countOther doesn't change countOther`() {
-        val attendanceDate = groupStartDate
-        staffAttendanceService.upsertStaffAttendance(
-            db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 1.0, 0.5),
+            StaffAttendanceUpdate(groupId, attendanceDate, 1.0),
         )
 
         var result =
@@ -164,11 +109,10 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
                 groupId,
             )
         assertEquals(1.0, result.attendances[attendanceDate]?.count)
-        assertEquals(0.5, result.attendances[attendanceDate]?.countOther)
 
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId, attendanceDate, 2.5, null),
+            StaffAttendanceUpdate(groupId, attendanceDate, 2.5),
         )
         result =
             staffAttendanceService.getGroupAttendancesByMonth(
@@ -178,7 +122,6 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
                 groupId,
             )
         assertEquals(2.5, result.attendances[attendanceDate]?.count)
-        assertEquals(0.5, result.attendances[attendanceDate]?.countOther)
     }
 
     @Test
@@ -187,7 +130,7 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
         assertThrows<BadRequest> {
             staffAttendanceService.upsertStaffAttendance(
                 db,
-                StaffAttendanceUpdate(groupId, attendanceDate, 1.0, 0.5),
+                StaffAttendanceUpdate(groupId, attendanceDate, 1.0),
             )
         }
 
@@ -206,23 +149,22 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
         val firstDay = groupStartDate
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId, firstDay, 1.0, 0.5),
+            StaffAttendanceUpdate(groupId, firstDay, 1.0),
         )
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId2, firstDay, 2.0, 1.5),
+            StaffAttendanceUpdate(groupId2, firstDay, 2.0),
         )
 
         val secondDay = groupStartDate.plusDays(5)
         staffAttendanceService.upsertStaffAttendance(
             db,
-            StaffAttendanceUpdate(groupId, secondDay, 6.5, null),
+            StaffAttendanceUpdate(groupId, secondDay, 6.5),
         )
 
         val unitResult = staffAttendanceService.getUnitAttendancesForDate(db, daycareId, firstDay)
         assertEquals(firstDay, unitResult.date)
         assertEquals(3.0, unitResult.count)
-        assertEquals(2.0, unitResult.countOther)
         assertEquals(2, unitResult.groups.size)
         assertEquals(
             db.read {
@@ -238,14 +180,11 @@ class StaffAttendanceServiceIntegrationTest : PureJdbiTest(resetDbBeforeEach = t
 
         val groupResult = unitResult.groups.find { it.groupId == groupId }!!
         assertEquals(1.0, groupResult.count)
-        assertEquals(0.5, groupResult.countOther)
         val group2Result = unitResult.groups.find { it.groupId == groupId2 }!!
         assertEquals(2.0, group2Result.count)
-        assertEquals(1.5, group2Result.countOther)
 
         val unitResult2 = staffAttendanceService.getUnitAttendancesForDate(db, daycareId, secondDay)
         assertEquals(secondDay, unitResult2.date)
         assertEquals(6.5, unitResult2.count)
-        assertEquals(0.0, unitResult2.countOther)
     }
 }
diff --git a/service/src/main/kotlin/fi/espoo/evaka/attendance/MobileUnitController.kt b/service/src/main/kotlin/fi/espoo/evaka/attendance/MobileUnitController.kt
index 81eda1a175d..1bd85f935aa 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/attendance/MobileUnitController.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/attendance/MobileUnitController.kt
@@ -280,7 +280,6 @@ data class UnitStats(
     val presentChildren: Int,
     val totalChildren: Int,
     val presentStaff: Double,
-    val presentStaffOther: Double,
     val totalStaff: Double,
     val utilization: Double,
 )
@@ -314,23 +313,23 @@ WITH present_children AS (
     WHERE unit_id = ANY(${bind(unitIds)})
     GROUP BY unit_id
 ), present_staff AS (
-    SELECT g.daycare_id AS unit_id, sum(sa.capacity) AS capacity, sum(sa.count) AS count, sum(sa.count_other) AS count_other
+    SELECT g.daycare_id AS unit_id, sum(sa.capacity) AS capacity, sum(sa.count) AS count
     FROM daycare_group g
     JOIN daycare ON g.daycare_id = daycare.id
     JOIN (
-        SELECT sa.group_id, 7 * sa.count as capacity, sa.count AS count, sa.count_other, FALSE AS realtime
+        SELECT sa.group_id, 7 * sa.count as capacity, sa.count AS count, FALSE AS realtime
         FROM staff_attendance sa
         WHERE sa.date = ${bind(date)}
 
         UNION ALL
 
-        SELECT sa.group_id, sa.occupancy_coefficient as capacity, 1 AS count, 0 AS count_other, TRUE AS realtime
+        SELECT sa.group_id, sa.occupancy_coefficient as capacity, 1 AS count, TRUE AS realtime
         FROM staff_attendance_realtime sa
         WHERE sa.departed IS NULL AND sa.occupancy_coefficient > 0
 
         UNION ALL
 
-        SELECT sa.group_id, sa.occupancy_coefficient as capacity, 1 AS count, 0 AS count_other, TRUE AS realtime
+        SELECT sa.group_id, sa.occupancy_coefficient as capacity, 1 AS count, TRUE AS realtime
         FROM staff_attendance_external sa
         WHERE sa.departed IS NULL AND sa.occupancy_coefficient > 0
     ) sa ON sa.group_id = g.id AND realtime = ('REALTIME_STAFF_ATTENDANCE' = ANY(daycare.enabled_pilot_features))
@@ -348,7 +347,6 @@ SELECT
     coalesce(pc.count, 0) AS present_children,
     coalesce(tc.count, 0) AS total_children,
     coalesce(ps.count, 0) AS present_staff,
-    coalesce(ps.count_other, 0) AS present_staff_other,
     coalesce(ts.count, 0) AS total_staff,
     CASE
         WHEN pc.capacity IS NULL OR pc.capacity = 0 THEN 0.0
diff --git a/service/src/main/kotlin/fi/espoo/evaka/daycare/UnitAcl.kt b/service/src/main/kotlin/fi/espoo/evaka/daycare/UnitAcl.kt
index 9c1d98820ef..6ee021c4dc9 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/daycare/UnitAcl.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/daycare/UnitAcl.kt
@@ -5,22 +5,10 @@
 package fi.espoo.evaka.daycare
 
 import fi.espoo.evaka.messaging.deactivateEmployeeMessageAccount
-import fi.espoo.evaka.shared.DaycareId
 import fi.espoo.evaka.shared.EmployeeId
-import fi.espoo.evaka.shared.auth.*
+import fi.espoo.evaka.shared.auth.hasAnyDaycareAclRow
 import fi.espoo.evaka.shared.db.Database
 
-fun removeDaycareAclForRole(
-    tx: Database.Transaction,
-    daycareId: DaycareId,
-    employeeId: EmployeeId,
-    role: UserRole,
-) {
-    tx.syncDaycareGroupAcl(daycareId, employeeId, emptyList())
-    tx.deleteDaycareAclRow(daycareId, employeeId, role)
-    deactivatePersonalMessageAccountIfNeeded(tx, employeeId)
-}
-
 fun deactivatePersonalMessageAccountIfNeeded(tx: Database.Transaction, employeeId: EmployeeId) {
     if (!tx.hasAnyDaycareAclRow(employeeId)) {
         // Deactivate the message account when the employee is not in any unit anymore
diff --git a/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/StaffAttendanceController.kt b/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/StaffAttendanceController.kt
index 2cb27d20a56..b1417dda955 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/StaffAttendanceController.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/StaffAttendanceController.kt
@@ -9,8 +9,6 @@ import fi.espoo.evaka.AuditId
 import fi.espoo.evaka.daycare.service.StaffAttendanceForDates
 import fi.espoo.evaka.daycare.service.StaffAttendanceService
 import fi.espoo.evaka.daycare.service.StaffAttendanceUpdate
-import fi.espoo.evaka.daycare.service.UnitStaffAttendance
-import fi.espoo.evaka.shared.DaycareId
 import fi.espoo.evaka.shared.GroupId
 import fi.espoo.evaka.shared.auth.AuthenticatedUser
 import fi.espoo.evaka.shared.db.Database
@@ -29,28 +27,6 @@ class StaffAttendanceController(
     private val staffAttendanceService: StaffAttendanceService,
     private val accessControl: AccessControl,
 ) {
-    @GetMapping("/employee-mobile/staff-attendances/unit/{unitId}")
-    fun getAttendancesByUnit(
-        db: Database,
-        user: AuthenticatedUser.MobileDevice,
-        clock: EvakaClock,
-        @PathVariable unitId: DaycareId,
-    ): UnitStaffAttendance {
-        return db.connect { dbc ->
-                dbc.read {
-                    accessControl.requirePermissionFor(
-                        it,
-                        user,
-                        clock,
-                        Action.Unit.READ_STAFF_ATTENDANCES,
-                        unitId,
-                    )
-                }
-                staffAttendanceService.getUnitAttendancesForDate(dbc, unitId, clock.today())
-            }
-            .also { Audit.UnitStaffAttendanceRead.log(targetId = AuditId(unitId)) }
-    }
-
     @GetMapping("/employee/staff-attendances/group/{groupId}")
     fun getStaffAttendancesByGroup(
         db: Database,
@@ -82,23 +58,6 @@ class StaffAttendanceController(
         clock: EvakaClock,
         @RequestBody staffAttendance: StaffAttendanceUpdate,
         @PathVariable groupId: GroupId,
-    ) = upsertStaffAttendance(db, user as AuthenticatedUser, clock, staffAttendance, groupId)
-
-    @PostMapping("/employee-mobile/staff-attendances/group/{groupId}")
-    fun upsertStaffAttendance(
-        db: Database,
-        user: AuthenticatedUser.MobileDevice,
-        clock: EvakaClock,
-        @RequestBody staffAttendance: StaffAttendanceUpdate,
-        @PathVariable groupId: GroupId,
-    ) = upsertStaffAttendance(db, user as AuthenticatedUser, clock, staffAttendance, groupId)
-
-    private fun upsertStaffAttendance(
-        db: Database,
-        user: AuthenticatedUser,
-        clock: EvakaClock,
-        @RequestBody staffAttendance: StaffAttendanceUpdate,
-        @PathVariable groupId: GroupId,
     ) {
         db.connect { dbc ->
             dbc.read {
diff --git a/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclController.kt b/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclController.kt
index c6172bc6e7f..d274484070d 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclController.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/UnitAclController.kt
@@ -10,14 +10,16 @@ import fi.espoo.evaka.absence.getDaycareIdByGroup
 import fi.espoo.evaka.attendance.OccupancyCoefficientUpsert
 import fi.espoo.evaka.attendance.getOccupancyCoefficientForEmployeeInUnit
 import fi.espoo.evaka.attendance.upsertOccupancyCoefficient
-import fi.espoo.evaka.daycare.removeDaycareAclForRole
+import fi.espoo.evaka.daycare.deactivatePersonalMessageAccountIfNeeded
 import fi.espoo.evaka.messaging.deactivateEmployeeMessageAccount
 import fi.espoo.evaka.messaging.upsertEmployeeMessageAccount
+import fi.espoo.evaka.pairing.deletePersonalDevices
 import fi.espoo.evaka.pis.Employee
 import fi.espoo.evaka.pis.NewEmployee
 import fi.espoo.evaka.pis.TemporaryEmployee
 import fi.espoo.evaka.pis.createEmployee
 import fi.espoo.evaka.pis.getEmployee
+import fi.espoo.evaka.pis.getEmployeeRoles
 import fi.espoo.evaka.pis.getPinCode
 import fi.espoo.evaka.pis.getTemporaryEmployees
 import fi.espoo.evaka.pis.updateEmployee
@@ -26,6 +28,8 @@ import fi.espoo.evaka.pis.upsertPinCode
 import fi.espoo.evaka.shared.DaycareId
 import fi.espoo.evaka.shared.EmployeeId
 import fi.espoo.evaka.shared.GroupId
+import fi.espoo.evaka.shared.async.AsyncJob
+import fi.espoo.evaka.shared.async.AsyncJobRunner
 import fi.espoo.evaka.shared.auth.*
 import fi.espoo.evaka.shared.db.Database
 import fi.espoo.evaka.shared.domain.*
@@ -41,8 +45,10 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class UnitAclController(private val accessControl: AccessControl) {
-
+class UnitAclController(
+    private val accessControl: AccessControl,
+    private val asyncJobRunner: AsyncJobRunner<AsyncJob>,
+) {
     val coefficientPositiveValue = BigDecimal("7.00")
     val coefficientNegativeValue = BigDecimal("0.00")
 
@@ -110,7 +116,13 @@ class UnitAclController(private val accessControl: AccessControl) {
                     daycareId,
                 )
                 validateIsPermanentEmployee(it, employeeId)
-                removeDaycareAclForRole(it, daycareId, employeeId, UserRole.UNIT_SUPERVISOR)
+                removeDaycareAclForRole(
+                    it,
+                    clock.now(),
+                    daycareId,
+                    employeeId,
+                    UserRole.UNIT_SUPERVISOR,
+                )
             }
         }
         Audit.UnitAclDelete.log(targetId = AuditId(daycareId), objectId = AuditId(employeeId))
@@ -136,6 +148,7 @@ class UnitAclController(private val accessControl: AccessControl) {
                 validateIsPermanentEmployee(it, employeeId)
                 removeDaycareAclForRole(
                     it,
+                    clock.now(),
                     daycareId,
                     employeeId,
                     UserRole.SPECIAL_EDUCATION_TEACHER,
@@ -165,6 +178,7 @@ class UnitAclController(private val accessControl: AccessControl) {
                 validateIsPermanentEmployee(it, employeeId)
                 removeDaycareAclForRole(
                     it,
+                    clock.now(),
                     daycareId,
                     employeeId,
                     UserRole.EARLY_CHILDHOOD_EDUCATION_SECRETARY,
@@ -192,7 +206,7 @@ class UnitAclController(private val accessControl: AccessControl) {
                     daycareId,
                 )
                 validateIsPermanentEmployee(it, employeeId)
-                removeDaycareAclForRole(it, daycareId, employeeId, UserRole.STAFF)
+                removeDaycareAclForRole(it, clock.now(), daycareId, employeeId, UserRole.STAFF)
             }
         }
         Audit.UnitAclDelete.log(targetId = AuditId(daycareId), objectId = AuditId(employeeId))
@@ -594,4 +608,47 @@ class UnitAclController(private val accessControl: AccessControl) {
 
     fun parseCoefficientValue(bool: Boolean) =
         if (bool) coefficientPositiveValue else coefficientNegativeValue
+
+    init {
+        asyncJobRunner.registerHandler(::deletePersonalMobileDevicesIfNeeded)
+    }
+
+    private fun deletePersonalMobileDevicesIfNeeded(
+        db: Database.Connection,
+        clock: EvakaClock,
+        job: AsyncJob.DeletePersonalDevicesIfNeeded,
+    ) {
+        db.transaction { tx ->
+            if (
+                !accessControl.hasPermissionFor(
+                    tx,
+                    AuthenticatedUser.Employee(job.employeeId, tx.getEmployeeRoles(job.employeeId)),
+                    clock,
+                    Action.Global.CREATE_PERSONAL_MOBILE_DEVICE_PAIRING,
+                )
+            ) {
+                tx.deletePersonalDevices(job.employeeId)
+            }
+        }
+    }
+
+    fun removeDaycareAclForRole(
+        tx: Database.Transaction,
+        now: HelsinkiDateTime,
+        daycareId: DaycareId,
+        employeeId: EmployeeId,
+        role: UserRole,
+    ) {
+        tx.syncDaycareGroupAcl(daycareId, employeeId, emptyList())
+        tx.deleteDaycareAclRow(daycareId, employeeId, role)
+        deactivatePersonalMessageAccountIfNeeded(tx, employeeId)
+
+        // Delete personal mobile devices after a while, in case the employee is added back to this
+        // or some other unit
+        asyncJobRunner.plan(
+            tx,
+            listOf(AsyncJob.DeletePersonalDevicesIfNeeded(employeeId)),
+            runAt = now.plusHours(1),
+        )
+    }
 }
diff --git a/service/src/main/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceService.kt b/service/src/main/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceService.kt
index 37a104aa0e1..608062b547b 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceService.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/daycare/service/StaffAttendanceService.kt
@@ -62,16 +62,7 @@ class StaffAttendanceService {
     }
 
     fun clearStaffAttendance(db: Database.Connection, groupId: GroupId, date: LocalDate) {
-        db.transaction { tx ->
-            val countOther = tx.getCountOtherForDate(groupId, date)
-            if (countOther > 0) {
-                tx.upsertStaffAttendance(
-                    StaffAttendanceUpdate(groupId, date, count = 0.0, countOther)
-                )
-            } else {
-                tx.deleteStaffAttendance(groupId, date)
-            }
-        }
+        db.transaction { tx -> tx.deleteStaffAttendance(groupId, date) }
     }
 }
 
@@ -79,14 +70,12 @@ data class GroupStaffAttendance(
     val groupId: GroupId,
     val date: LocalDate,
     val count: Double,
-    val countOther: Double,
     val updated: HelsinkiDateTime,
 )
 
 data class UnitStaffAttendance(
     val date: LocalDate,
     val count: Double,
-    val countOther: Double,
     val updated: HelsinkiDateTime?,
     val groups: List<GroupStaffAttendance>,
 )
@@ -106,12 +95,7 @@ data class GroupInfo(
     val endDate: LocalDate?,
 )
 
-data class StaffAttendanceUpdate(
-    val groupId: GroupId,
-    val date: LocalDate,
-    val count: Double?,
-    val countOther: Double?,
-)
+data class StaffAttendanceUpdate(val groupId: GroupId, val date: LocalDate, val count: Double?)
 
 fun Database.Read.getGroupInfo(groupId: GroupId): GroupInfo? =
     createQuery {
@@ -142,26 +126,14 @@ SELECT EXISTS (
 
 fun Database.Transaction.upsertStaffAttendance(staffAttendance: StaffAttendanceUpdate) {
     execute {
-        if (staffAttendance.countOther != null) {
-            sql(
-                """
-INSERT INTO staff_attendance (group_id, date, count, count_other)
-VALUES (${bind(staffAttendance.groupId)}, ${bind(staffAttendance.date)}, ${bind(staffAttendance.count)}, ${bind(staffAttendance.countOther)})
-ON CONFLICT (group_id, date) DO UPDATE SET
-    count = ${bind(staffAttendance.count)},
-    count_other = ${bind(staffAttendance.countOther)}
-"""
-            )
-        } else {
-            sql(
-                """
-INSERT INTO staff_attendance (group_id, date, count, count_other)
-VALUES (${bind(staffAttendance.groupId)}, ${bind(staffAttendance.date)}, ${bind(staffAttendance.count)}, DEFAULT)
+        sql(
+            """
+INSERT INTO staff_attendance (group_id, date, count)
+VALUES (${bind(staffAttendance.groupId)}, ${bind(staffAttendance.date)}, ${bind(staffAttendance.count)})
 ON CONFLICT (group_id, date) DO UPDATE SET
     count = ${bind(staffAttendance.count)}
 """
-            )
-        }
+        )
     }
 }
 
@@ -172,7 +144,7 @@ fun Database.Read.getStaffAttendanceByRange(
     createQuery {
             sql(
                 """
-SELECT group_id, date, count, count_other, updated
+SELECT group_id, date, count, updated
 FROM staff_attendance
 WHERE group_id = ${bind(groupId)}
 AND between_start_and_end(${bind(range)}, date)
@@ -189,7 +161,7 @@ fun Database.Read.getUnitStaffAttendanceForDate(
         createQuery {
                 sql(
                     """
-SELECT group_id, date, count, count_other, updated
+SELECT group_id, date, count, updated
 FROM staff_attendance sa
 JOIN daycare_group dg on sa.group_id = dg.id
 WHERE dg.daycare_id = ${bind(unitId)}
@@ -200,31 +172,16 @@ WHERE dg.daycare_id = ${bind(unitId)}
             .toList<GroupStaffAttendance>()
 
     val count = groupAttendances.sumOf { it.count }
-    val countOther = groupAttendances.sumOf { it.countOther }
     val updated = groupAttendances.maxOfOrNull { it.updated }
 
     return UnitStaffAttendance(
         date = date,
         count = count,
-        countOther = countOther,
         groups = groupAttendances,
         updated = updated,
     )
 }
 
-fun Database.Read.getCountOtherForDate(groupId: GroupId, date: LocalDate): Double =
-    createQuery {
-            sql(
-                """
-SELECT count_other
-FROM staff_attendance
-WHERE group_id = ${bind(groupId)}
-AND date = ${bind(date)}
-"""
-            )
-        }
-        .exactlyOneOrNull() ?: 0.0
-
 fun Database.Transaction.deleteStaffAttendance(groupId: GroupId, date: LocalDate) {
     createUpdate {
             sql(
diff --git a/service/src/main/kotlin/fi/espoo/evaka/occupancy/OccupancyController.kt b/service/src/main/kotlin/fi/espoo/evaka/occupancy/OccupancyController.kt
index 74c788f37a0..8e30bd2bfee 100755
--- a/service/src/main/kotlin/fi/espoo/evaka/occupancy/OccupancyController.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/occupancy/OccupancyController.kt
@@ -44,48 +44,6 @@ class OccupancyController(
     private val placementPlanService: PlacementPlanService,
 ) {
 
-    @GetMapping("/employee-mobile/occupancy/by-unit/{unitId}")
-    fun getOccupancyPeriods(
-        db: Database,
-        user: AuthenticatedUser.MobileDevice,
-        clock: EvakaClock,
-        @PathVariable unitId: DaycareId,
-        @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) from: LocalDate,
-        @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) to: LocalDate,
-        @RequestParam type: OccupancyType,
-    ): OccupancyResponse {
-        val occupancies =
-            db.connect { dbc ->
-                dbc.read {
-                    accessControl.requirePermissionFor(
-                        it,
-                        user,
-                        clock,
-                        Action.Unit.READ_OCCUPANCIES,
-                        unitId,
-                    )
-                    it.calculateOccupancyPeriods(
-                        clock.today(),
-                        unitId,
-                        FiniteDateRange(from, to),
-                        type,
-                        AccessControlFilter.PermitAll,
-                        groupId = null,
-                    )
-                }
-            }
-        Audit.OccupancyRead.log(
-            targetId = AuditId(unitId),
-            meta = mapOf("count" to occupancies.size),
-        )
-
-        return OccupancyResponse(
-            occupancies = occupancies,
-            max = occupancies.filter { it.percentage != null }.maxByOrNull { it.percentage!! },
-            min = occupancies.filter { it.percentage != null }.minByOrNull { it.percentage!! },
-        )
-    }
-
     @GetMapping("/employee/occupancy/by-unit/{unitId}/speculated/{applicationId}")
     fun getOccupancyPeriodsSpeculated(
         db: Database,
@@ -279,64 +237,6 @@ class OccupancyController(
             }
             .also { Audit.OccupancyRead.log(targetId = AuditId(unitId)) }
     }
-
-    @GetMapping("/employee-mobile/occupancy/by-unit/{unitId}/groups")
-    fun getOccupancyPeriodsOnGroups(
-        db: Database,
-        user: AuthenticatedUser.MobileDevice,
-        clock: EvakaClock,
-        @PathVariable unitId: DaycareId,
-        @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) from: LocalDate,
-        @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) to: LocalDate,
-        @RequestParam type: OccupancyType,
-    ): List<OccupancyResponseGroupLevel> {
-        val occupancies =
-            db.connect { dbc ->
-                dbc.read {
-                    accessControl.requirePermissionFor(
-                        it,
-                        user,
-                        clock,
-                        Action.Unit.READ_OCCUPANCIES,
-                        unitId,
-                    )
-                    it.calculateOccupancyPeriodsGroupLevel(
-                        clock.today(),
-                        unitId,
-                        FiniteDateRange(from, to),
-                        type,
-                        AccessControlFilter.PermitAll,
-                    )
-                }
-            }
-        Audit.OccupancyRead.log(
-            targetId = AuditId(unitId),
-            meta = mapOf("count" to occupancies.size),
-        )
-
-        return occupancies
-            .groupBy({ it.groupId }) {
-                OccupancyPeriod(it.period, it.sum, it.headcount, it.caretakers, it.percentage)
-            }
-            .entries
-            .map { (key, value) ->
-                OccupancyResponseGroupLevel(
-                    groupId = key,
-                    occupancies =
-                        OccupancyResponse(
-                            occupancies = value,
-                            max =
-                                value
-                                    .filter { it.percentage != null }
-                                    .maxByOrNull { it.percentage!! },
-                            min =
-                                value
-                                    .filter { it.percentage != null }
-                                    .minByOrNull { it.percentage!! },
-                        ),
-                )
-            }
-    }
 }
 
 data class UnitOccupancies(
@@ -400,8 +300,6 @@ private fun getOccupancyResponse(occupancies: List<OccupancyPeriod>): OccupancyR
     )
 }
 
-data class OccupancyResponseGroupLevel(val groupId: GroupId, val occupancies: OccupancyResponse)
-
 data class OccupancyResponse(
     val occupancies: List<OccupancyPeriod>,
     val max: OccupancyPeriod?,
diff --git a/service/src/main/kotlin/fi/espoo/evaka/pairing/MobileDeviceQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/pairing/MobileDeviceQueries.kt
index 28b0ff7d93c..6c6d4f755f9 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/pairing/MobileDeviceQueries.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/pairing/MobileDeviceQueries.kt
@@ -78,3 +78,7 @@ fun Database.Transaction.renameDevice(id: MobileDeviceId, name: String) {
 
 fun Database.Transaction.deleteDevice(id: MobileDeviceId) =
     createUpdate { sql("DELETE FROM mobile_device WHERE id = ${bind(id)}") }.execute()
+
+fun Database.Transaction.deletePersonalDevices(employee: EmployeeId) = execute {
+    sql("DELETE FROM mobile_device WHERE employee_id = ${bind(employee)}")
+}
diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt
index 642a7d86125..5b4b55f1dc0 100755
--- a/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt
@@ -428,6 +428,10 @@ sealed interface AsyncJob : AsyncJobPayload {
         override val user: AuthenticatedUser? = null
     }
 
+    data class DeletePersonalDevicesIfNeeded(val employeeId: EmployeeId) : AsyncJob {
+        override val user: AuthenticatedUser? = null
+    }
+
     companion object {
         val main =
             AsyncJobRunner.Pool(
@@ -462,6 +466,7 @@ sealed interface AsyncJob : AsyncJobPayload {
                     PlacementTool::class,
                     PlacementToolFromSSN::class,
                     InvoiceCorrectionMigration::class,
+                    DeletePersonalDevicesIfNeeded::class,
                 ),
             )
         val email =
diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/auth/AuthenticatedUser.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/auth/AuthenticatedUser.kt
index b9da0907f69..029e9026117 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/shared/auth/AuthenticatedUser.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/shared/auth/AuthenticatedUser.kt
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.google.common.hash.HashCode
 import com.google.common.hash.Hashing
+import fi.espoo.evaka.pis.EmployeeRoles
 import fi.espoo.evaka.pis.EmployeeUser
 import fi.espoo.evaka.shared.EmployeeId
 import fi.espoo.evaka.shared.EvakaUserId
@@ -45,6 +46,11 @@ sealed class AuthenticatedUser {
         val globalRoles: Set<UserRole>,
         val allScopedRoles: Set<UserRole>,
     ) : AuthenticatedUser() {
+        constructor(
+            id: EmployeeId,
+            roles: EmployeeRoles,
+        ) : this(id, roles.globalRoles, roles.allScopedRoles)
+
         constructor(
             id: EmployeeId,
             roles: Set<UserRole>,
diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/security/Action.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/security/Action.kt
index d4573cfec5d..690fb9f722c 100644
--- a/service/src/main/kotlin/fi/espoo/evaka/shared/security/Action.kt
+++ b/service/src/main/kotlin/fi/espoo/evaka/shared/security/Action.kt
@@ -146,7 +146,9 @@ sealed interface Action {
         ),
         PERSONAL_MOBILE_DEVICE_PAGE(
             HasGlobalRole(ADMIN),
-            HasUnitRole(UNIT_SUPERVISOR).inAnyUnit(),
+            HasUnitRole(UNIT_SUPERVISOR)
+                .withUnitProviderTypes(ProviderType.MUNICIPAL, ProviderType.MUNICIPAL_SCHOOL)
+                .inAnyUnit(),
             IsEmployee.ownerOfAnyMobileDevice(),
         ),
         PIN_CODE_PAGE(
@@ -201,7 +203,9 @@ sealed interface Action {
         READ_PERSONAL_MOBILE_DEVICES(IsEmployee.any()),
         CREATE_PERSONAL_MOBILE_DEVICE_PAIRING(
             HasGlobalRole(ADMIN),
-            HasUnitRole(UNIT_SUPERVISOR).inAnyUnit(),
+            HasUnitRole(UNIT_SUPERVISOR)
+                .withUnitProviderTypes(ProviderType.MUNICIPAL, ProviderType.MUNICIPAL_SCHOOL)
+                .inAnyUnit(),
         ),
         SEARCH_INVOICES(HasGlobalRole(ADMIN, FINANCE_ADMIN, FINANCE_STAFF)),
         CREATE_DRAFT_INVOICES(HasGlobalRole(ADMIN, FINANCE_ADMIN)),
diff --git a/service/src/main/resources/db/migration/V478__delete_disallowed_personal_mobile_pairings.sql b/service/src/main/resources/db/migration/V478__delete_disallowed_personal_mobile_pairings.sql
new file mode 100644
index 00000000000..f8900b21e94
--- /dev/null
+++ b/service/src/main/resources/db/migration/V478__delete_disallowed_personal_mobile_pairings.sql
@@ -0,0 +1,25 @@
+WITH disallowed_devices AS (
+    SELECT id
+    FROM mobile_device
+    WHERE
+        employee_id IS NOT NULL AND
+        NOT EXISTS (
+            SELECT FROM daycare_acl a
+            JOIN daycare d ON d.id = a.daycare_id
+            WHERE
+                (d.provider_type = 'MUNICIPAL' OR d.provider_type = 'MUNICIPAL_SCHOOL') AND
+                a.employee_id = mobile_device.employee_id AND
+                a.role = 'UNIT_SUPERVISOR'
+        )
+), push_subscriptions AS (
+    DELETE FROM mobile_device_push_subscription
+    WHERE device IN (SELECT id FROM disallowed_devices)
+), push_groups AS (
+    DELETE FROM mobile_device_push_group
+    WHERE device IN (SELECT id FROM disallowed_devices)
+), pairings AS (
+    DELETE FROM pairing
+    WHERE mobile_device_id IN (SELECT id FROM disallowed_devices)
+)
+DELETE FROM mobile_device
+WHERE id IN (SELECT id FROM disallowed_devices);
diff --git a/service/src/main/resources/db/migration/V479__drop_staff_attendance_count_other.sql b/service/src/main/resources/db/migration/V479__drop_staff_attendance_count_other.sql
new file mode 100644
index 00000000000..a5f07abca69
--- /dev/null
+++ b/service/src/main/resources/db/migration/V479__drop_staff_attendance_count_other.sql
@@ -0,0 +1 @@
+ALTER TABLE staff_attendance DROP COLUMN count_other;
diff --git a/service/src/main/resources/migrations.txt b/service/src/main/resources/migrations.txt
index 9891bb0de7f..88d5fae5baa 100644
--- a/service/src/main/resources/migrations.txt
+++ b/service/src/main/resources/migrations.txt
@@ -473,3 +473,5 @@ V474__holiday_questionnaire_open_ranges.sql
 V475__application_modified_metadata.sql
 V476__finance_metadata_process.sql
 V477__titania_errors_id.sql
+V478__delete_disallowed_personal_mobile_pairings.sql
+V479__drop_staff_attendance_count_other.sql