diff --git a/client/src/App.tsx b/client/src/App.tsx
index f0e62754..52dfc3bf 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -14,10 +14,8 @@ import { ApplicationFormAccessMode } from './forms/DefaultApplicationForm'
 import { CoachApplicationForm } from './forms/CoachApplicationForm'
 import { TutorApplicationForm } from './forms/TutorApplicationForm'
 import { LandingPage } from './utilities/LandingPage/LandingPage'
-import { ThesisApplicationForm } from './forms/ThesisApplicationForm'
 import { IntroCourseConsole } from './management/IntroCourse/IntroCourseConsole'
 import type Keycloak from 'keycloak-js'
-import { ThesisApplicationsManagementConsole } from './management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole'
 import { DevelopmentProfileSubmission } from './student/DevelopmentProfileSubmission/DevelopmentProfileSubmission'
 import { MailingManagementConsole } from './management/MailingManagement/MailingManagementConsole'
 import { GradingManagementConsole } from './management/Grading/GradingManagementConsole'
@@ -57,10 +55,6 @@ export const App = (): JSX.Element => {
           <Notifications limit={5} />
           <BrowserRouter>
             <Routes>
-              <Route
-                path='/management/thesis-applications/:applicationId?'
-                element={<ThesisApplicationsManagementConsole />}
-              />
               <Route
                 path='/management/course-iterations'
                 element={
@@ -207,14 +201,6 @@ export const App = (): JSX.Element => {
                   />
                 }
               />
-              <Route
-                path='/applications/thesis'
-                element={
-                  <ApplicationSubmissionPage
-                    child={<ThesisApplicationForm accessMode={ApplicationFormAccessMode.STUDENT} />}
-                  />
-                }
-              />
               <Route path='/' element={<LandingPage />} />
               <Route path='*' element={<Fallback />} />
             </Routes>
diff --git a/client/src/forms/ThesisApplicationForm.tsx b/client/src/forms/ThesisApplicationForm.tsx
deleted file mode 100644
index 51c13645..00000000
--- a/client/src/forms/ThesisApplicationForm.tsx
+++ /dev/null
@@ -1,969 +0,0 @@
-import { isEmail, isNotEmpty, useForm } from '@mantine/form'
-import { Dropzone, PDF_MIME_TYPE } from '@mantine/dropzone'
-import moment from 'moment'
-import countries from 'i18n-iso-countries'
-import enLocale from 'i18n-iso-countries/langs/en.json'
-import {
-  ActionIcon,
-  Box,
-  Button,
-  Card,
-  Center,
-  Checkbox,
-  Divider,
-  Group,
-  Image,
-  Loader,
-  LoadingOverlay,
-  Select,
-  Spoiler,
-  Stack,
-  Text,
-  Textarea,
-  Title,
-  rem,
-  useMantineTheme,
-} from '@mantine/core'
-import { Gender, StudyDegree, StudyProgram } from '../interface/application'
-import { ApplicationFormAccessMode } from './DefaultApplicationForm'
-import { DeclarationOfDataConsent } from './DeclarationOfDataConsent'
-import { IconCalendar, IconPhoto, IconUpload, IconX } from '@tabler/icons-react'
-import LS1Logo from '../static/ls1logo.png'
-import { DatePickerInput } from '@mantine/dates'
-import { notifications } from '@mantine/notifications'
-import { useDisclosure } from '@mantine/hooks'
-import { ApplicationSuccessfulSubmission } from '../student/StudentApplicationSubmissionPage/ApplicationSuccessfulSubmission'
-import { useEffect, useState } from 'react'
-import { FormTextField } from './components/FormTextField'
-import { FormSelectField } from './components/FormSelectField'
-import { useThesisApplicationStore } from '../state/zustand/useThesisApplicationStore'
-import { useMutation, useQueryClient } from '@tanstack/react-query'
-import {
-  getThesisApplicationBachelorReportFile,
-  getThesisApplicationCvFile,
-  getThesisApplicationExaminationFile,
-  postThesisApplicatioAcceptance,
-  postThesisApplication,
-  postThesisApplicationAssessment,
-  postThesisApplicationRejection,
-  postThesisApplicationThesisAdvisorAssignment,
-} from '../network/thesisApplication'
-import { FocusTopic, ResearchArea, ThesisApplication } from '../interface/thesisApplication'
-import { Query } from '../state/query'
-
-countries.registerLocale(enLocale)
-const countriesArr = Object.entries(countries.getNames('en', { select: 'alias' })).map(
-  ([key, value]) => {
-    return {
-      label: value,
-      value: key,
-    }
-  },
-)
-
-interface ThesisApplicationFormProps {
-  accessMode: ApplicationFormAccessMode
-  application?: ThesisApplication
-}
-
-export const ThesisApplicationForm = ({
-  application,
-  accessMode,
-}: ThesisApplicationFormProps): JSX.Element => {
-  const theme = useMantineTheme()
-  const queryClient = useQueryClient()
-  const { thesisAdvisors } = useThesisApplicationStore()
-  const [loadingOverlayVisible, loadingOverlayHandlers] = useDisclosure(false)
-  const [applicationSuccessfullySubmitted, setApplicationSuccessfullySubmitted] = useState(false)
-  const [notifyStudent, setNotifyStudent] = useState(true)
-  const uploads = useForm<{
-    examinationReport: File | undefined
-    cv: File | undefined
-    bachelorReport: File | undefined
-  }>({
-    initialValues: {
-      examinationReport: undefined,
-      cv: undefined,
-      bachelorReport: undefined,
-    },
-    validate: {
-      examinationReport: (value) => {
-        if (!value) {
-          return 'Please upload your examination report.'
-        } else if (value && value.size > 1 * 1024 ** 2) {
-          return 'The file should not exceed 3mb'
-        }
-      },
-      cv: (value) => {
-        if (!value) {
-          return 'Please upload your CV.'
-        } else if (value && value.size > 1 * 1024 ** 2) {
-          return 'The file should not exceed 3mb'
-        }
-      },
-    },
-  })
-  const form = useForm<ThesisApplication>({
-    initialValues: application
-      ? {
-          ...application,
-          desiredThesisStart: new Date(application.desiredThesisStart),
-          assessmentComment: application.assessmentComment ?? '',
-        }
-      : {
-          id: '',
-          student: {
-            id: '',
-            tumId: '',
-            matriculationNumber: '',
-            isExchangeStudent: false,
-            email: '',
-            firstName: '',
-            lastName: '',
-            nationality: '',
-            gender: undefined,
-            suggestedAsCoach: false,
-            suggestedAsTutor: false,
-            blockedByPm: false,
-            reasonForBlockedByPm: '',
-          },
-          studyDegree: undefined,
-          studyProgram: undefined,
-          currentSemester: '',
-          start: '',
-          specialSkills: '',
-          researchAreas: [],
-          focusTopics: [],
-          motivation: '',
-          projects: '',
-          interests: '',
-          thesisTitle: '',
-          desiredThesisStart: new Date(),
-          applicationStatus: 'NOT_ASSESSED',
-          assessmentComment: '',
-        },
-    validateInputOnChange: ['student.tumId'],
-    validateInputOnBlur: true,
-    validate: {
-      student: {
-        tumId: (value, values) =>
-          /^[A-Za-z]{2}[0-9]{2}[A-Za-z]{3}$/.test(value ?? '') || values.student?.isExchangeStudent
-            ? null
-            : 'This is not a valid TUM ID',
-        matriculationNumber: (value, values) =>
-          /^\d{8}$/.test(value ?? '') || values.student?.isExchangeStudent
-            ? null
-            : 'This is not a valid matriculation number.',
-        firstName: isNotEmpty('Please state your first name.'),
-        lastName: isNotEmpty('Please state your last name'),
-        email: isEmail('Invalid email'),
-        gender: isNotEmpty('Please state your gender.'),
-        nationality: isNotEmpty('Please state your nationality.'),
-      },
-      motivation: (value) => {
-        if (!value || !isNotEmpty(value)) {
-          return 'Please state your motivation for the thesis.'
-        } else if (value.length > 500) {
-          return 'The maximum allowed number of characters is 500.'
-        }
-      },
-      specialSkills: (value) => {
-        if (!value || !isNotEmpty(value)) {
-          return 'Please state your special skills.'
-        } else if (value.length > 500) {
-          return 'The maximum allowed number of characters is 500.'
-        }
-      },
-      interests: (value) => {
-        if (!value || !isNotEmpty(value)) {
-          return 'Please state your interests.'
-        } else if (value.length > 500) {
-          return 'The maximum allowed number of characters is 500.'
-        }
-      },
-      projects: (value) => {
-        if (!value || !isNotEmpty(value)) {
-          return 'Please state your projects.'
-        } else if (value.length > 500) {
-          return 'The maximum allowed number of characters is 500.'
-        }
-      },
-      thesisTitle: (value) => {
-        if (!value || !isNotEmpty(value)) {
-          return 'Please state your thesis title suggestion.'
-        } else if (value.length > 200) {
-          return 'The maximum allowed number of characters is 200.'
-        }
-      },
-      studyDegree: isNotEmpty('Please state your study degree.'),
-      studyProgram: isNotEmpty('Please state your study program.'),
-      currentSemester: (value) => {
-        return !value || value.length === 0 || !/\b([1-9]|[1-9][0-9])\b/.test(value)
-          ? 'Please state your current semester.'
-          : null
-      },
-    },
-  })
-  const consentForm = useForm({
-    initialValues: {
-      declarationOfConsentAccepted: false,
-    },
-    validateInputOnChange: true,
-    validate: {
-      declarationOfConsentAccepted: (value) => !value,
-    },
-  })
-  const [thesisAdvisorId, setThesisAdvisorId] = useState<string | null>(
-    application?.thesisAdvisor?.id ?? null,
-  )
-
-  const assessThesisApplication = useMutation({
-    mutationFn: () =>
-      postThesisApplicationAssessment(application?.id ?? '', {
-        status: form.values.applicationStatus,
-        assessmentComment: form.values.assessmentComment ?? '',
-      }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: [Query.THESIS_APPLICATION] })
-    },
-  })
-
-  const assignThesisApplicationToThesisAdvisor = useMutation({
-    mutationFn: () =>
-      postThesisApplicationThesisAdvisorAssignment(application?.id ?? '', thesisAdvisorId ?? ''),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: [Query.THESIS_APPLICATION] })
-    },
-  })
-
-  const acceptThesisApplication = useMutation({
-    mutationFn: () => postThesisApplicatioAcceptance(application?.id ?? '', notifyStudent),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: [Query.THESIS_APPLICATION] })
-    },
-  })
-
-  const rejectThesisApplication = useMutation({
-    mutationFn: () => postThesisApplicationRejection(application?.id ?? '', notifyStudent),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: [Query.THESIS_APPLICATION] })
-    },
-  })
-
-  useEffect(() => {
-    setThesisAdvisorId(application?.thesisAdvisor?.id ?? null)
-  }, [application])
-
-  return (
-    <Box
-      style={{
-        display: 'flex',
-        flexDirection: 'column',
-        maxWidth: '80vw',
-        gap: '2vh',
-      }}
-      mx='auto'
-      pos='relative'
-    >
-      <LoadingOverlay visible={loadingOverlayVisible} overlayProps={{ blur: 2 }} />
-      {applicationSuccessfullySubmitted ? (
-        <ApplicationSuccessfulSubmission
-          title='Your application was successfully submitted!'
-          text='We will contact you as soon as we have reviewed your application.'
-        />
-      ) : (
-        <Stack>
-          {accessMode === ApplicationFormAccessMode.STUDENT && (
-            <Group
-              style={{
-                display: 'flex',
-                flexDirection: 'row',
-                justifyContent: 'center',
-              }}
-            >
-              <div
-                style={{
-                  width: '15vw',
-                  height: '15vw',
-                }}
-              >
-                <Image src={LS1Logo} alt='LS1 Logo' />
-              </div>
-              <Center>
-                <Title order={3}>Thesis Application at LS1 Chair</Title>
-              </Center>
-            </Group>
-          )}
-          <form style={{ display: 'flex', flexDirection: 'column', gap: '2vh' }}>
-            <Group grow align='flex-start'>
-              <FormTextField
-                required={!form.values.student?.isExchangeStudent}
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='TUM ID'
-                placeholder='TUM ID'
-                value={form.values.student?.tumId ?? ''}
-                textInputProps={form.getInputProps('student.tumId')}
-              />
-              <FormTextField
-                required={!form.values.student?.isExchangeStudent}
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Matriculation Number'
-                placeholder='Matriculation number'
-                value={form.values.student?.matriculationNumber ?? ''}
-                textInputProps={form.getInputProps('student.matriculationNumber')}
-              />
-            </Group>
-            <Group grow align='flex-start'>
-              <FormTextField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='First name'
-                placeholder='First Name'
-                value={form.values.student?.firstName ?? ''}
-                textInputProps={form.getInputProps('student.firstName')}
-              />
-              <FormTextField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Last name'
-                placeholder='Last Name'
-                value={form.values.student?.lastName ?? ''}
-                textInputProps={form.getInputProps('student.lastName')}
-              />
-            </Group>
-            <Group grow align='flex-start'>
-              <FormSelectField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Gender'
-                placeholder='Gender'
-                readValue={Gender[form.values.student.gender as unknown as keyof typeof Gender]}
-                data={Object.keys(Gender).map((key) => {
-                  return {
-                    label: Gender[key as keyof typeof Gender],
-                    value: key,
-                  }
-                })}
-                selectProps={form.getInputProps('student.gender')}
-              />
-              <FormSelectField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Nationality'
-                placeholder='Nationality'
-                readValue={
-                  countriesArr.find((c) => c.value == form.values.student.nationality)?.label ?? ''
-                }
-                data={countriesArr}
-                selectProps={form.getInputProps('student.nationality')}
-              />
-            </Group>
-            <FormTextField
-              required
-              readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-              label='Email (preferrably a TUM email address)'
-              placeholder='your@email.com'
-              value={form.values.student?.email ?? ''}
-              textInputProps={form.getInputProps('student.email')}
-            />
-            <Group grow align='flex-start'>
-              <FormSelectField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Study Degree'
-                placeholder='Study Degree'
-                readValue={
-                  StudyDegree[form.values.studyDegree as unknown as keyof typeof StudyDegree]
-                }
-                data={Object.keys(StudyDegree).map((key) => {
-                  return {
-                    label: StudyDegree[key as keyof typeof StudyDegree],
-                    value: key,
-                  }
-                })}
-                selectProps={form.getInputProps('studyDegree')}
-              />
-              <FormSelectField
-                required
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Study Program'
-                placeholder='Study Program'
-                readValue={
-                  StudyProgram[form.values.studyProgram as unknown as keyof typeof StudyProgram]
-                }
-                data={Object.keys(StudyProgram).map((key) => {
-                  return {
-                    label: StudyProgram[key as keyof typeof StudyProgram],
-                    value: key,
-                  }
-                })}
-                selectProps={form.getInputProps('studyProgram')}
-              />
-              <FormTextField
-                required
-                numeric
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                placeholder='Current semester'
-                label='Current Semester'
-                value={form.values.currentSemester ?? ''}
-                textInputProps={form.getInputProps('currentSemester')}
-              />
-            </Group>
-            <Group grow align='flex-start'>
-              <div>
-                <FormTextField
-                  required
-                  textArea
-                  readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                  label='Special Skills'
-                  placeholder='Programming languages, certificates, etc.'
-                  value={form.values.specialSkills ?? ''}
-                  textAreaProps={form.getInputProps('specialSkills')}
-                />
-                {!form.errors.specialSkills &&
-                  accessMode !== ApplicationFormAccessMode.INSTRUCTOR && (
-                    <Text fz='xs' ta='right'>{`${
-                      form.values.specialSkills?.length ?? 0
-                    } / 500`}</Text>
-                  )}
-              </div>
-              <div>
-                <FormTextField
-                  required
-                  textArea
-                  readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                  label='Motivation'
-                  placeholder='What are you looking for?'
-                  value={form.values.motivation ?? ''}
-                  textAreaProps={form.getInputProps('motivation')}
-                />
-                {!form.errors.motivation && accessMode !== ApplicationFormAccessMode.INSTRUCTOR && (
-                  <Text fz='xs' ta='right'>{`${form.values.motivation?.length ?? 0} / 500`}</Text>
-                )}
-              </div>
-            </Group>
-            <Group grow align='flex-start'>
-              <div>
-                <FormTextField
-                  required
-                  textArea
-                  readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                  label='Interests'
-                  placeholder='What are you interested in?'
-                  value={form.values.interests ?? ''}
-                  textAreaProps={form.getInputProps('interests')}
-                />
-                {!form.errors.interests && accessMode !== ApplicationFormAccessMode.INSTRUCTOR && (
-                  <Text fz='xs' ta='right'>{`${form.values.interests?.length ?? 0} / 500`}</Text>
-                )}
-              </div>
-              <div>
-                <FormTextField
-                  required
-                  textArea
-                  readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                  label='Projects'
-                  placeholder='What projects have you worked on?'
-                  value={form.values.projects ?? ''}
-                  textAreaProps={form.getInputProps('projects')}
-                />
-                {!form.errors.projects && accessMode !== ApplicationFormAccessMode.INSTRUCTOR && (
-                  <Text fz='xs' ta='right'>{`${form.values.projects?.length ?? 0} / 500`}</Text>
-                )}
-              </div>
-            </Group>
-            <div>
-              <FormTextField
-                required
-                textArea
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                label='Thesis Title Suggestion'
-                placeholder='Thesis title suggestion'
-                value={form.values.thesisTitle ?? ''}
-                textAreaProps={form.getInputProps('thesisTitle')}
-              />
-              {!form.errors.thesisTitle && accessMode !== ApplicationFormAccessMode.INSTRUCTOR && (
-                <Text fz='xs' ta='right'>{`${form.values.thesisTitle?.length ?? 0} / 200`}</Text>
-              )}
-            </div>
-            {accessMode === ApplicationFormAccessMode.INSTRUCTOR ? (
-              <Stack style={{ gap: '0' }}>
-                <Text c='dimmed' fz='xs' fw={700}>
-                  Desired Thesis Start Date
-                </Text>
-                <Text fz='sm' lineClamp={20}>
-                  {moment(form.values.desiredThesisStart).format('DD. MMMM YYYY')}
-                </Text>
-              </Stack>
-            ) : (
-              <DatePickerInput
-                leftSection={<IconCalendar />}
-                label='Desired Thesis Start Date'
-                {...form.getInputProps('desiredThesisStart')}
-              />
-            )}
-            <Group grow>
-              <FormSelectField
-                required
-                multiselect
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                data={Object.keys(ResearchArea).map((key) => {
-                  return {
-                    label: ResearchArea[key as keyof typeof ResearchArea],
-                    value: key,
-                  }
-                })}
-                label='Research Areas'
-                placeholder='Research areas'
-                readValue={form.values.researchAreas
-                  .map((ra) => ResearchArea[ra as unknown as keyof typeof ResearchArea])
-                  .join(', ')}
-                multiselectProps={form.getInputProps('researchAreas')}
-              />
-              <FormSelectField
-                required
-                multiselect
-                readOnly={accessMode === ApplicationFormAccessMode.INSTRUCTOR}
-                data={Object.keys(FocusTopic).map((key) => {
-                  return {
-                    label: FocusTopic[key as keyof typeof FocusTopic],
-                    value: key,
-                  }
-                })}
-                label='Focus Topics'
-                placeholder='Focus topics'
-                readValue={form.values.focusTopics
-                  .map((ft) => FocusTopic[ft as unknown as keyof typeof FocusTopic])
-                  .join(', ')}
-                multiselectProps={form.getInputProps('focusTopics')}
-              />
-            </Group>
-            {accessMode === ApplicationFormAccessMode.STUDENT && (
-              <Stack>
-                <Group align='left'>
-                  <Text fw={500} fz='sm'>
-                    Examination Report
-                  </Text>
-                  <Text color='red'>*</Text>
-                </Group>
-                {uploads.values.examinationReport && (
-                  <Card shadow='sm' withBorder>
-                    <Group align='apart'>
-                      <Text c='dimmed' fz='sm'>
-                        {uploads.values.examinationReport.name}
-                      </Text>
-                      <ActionIcon
-                        onClick={() => {
-                          uploads.setValues({ examinationReport: undefined })
-                        }}
-                      >
-                        <IconX />
-                      </ActionIcon>
-                    </Group>
-                  </Card>
-                )}
-                {!uploads.values.examinationReport && (
-                  <Dropzone
-                    name='Examination Report'
-                    disabled={!!uploads.values.examinationReport}
-                    onDrop={(files) => {
-                      if (files[0]) {
-                        uploads.setValues({
-                          examinationReport: files[0],
-                        })
-                      }
-                    }}
-                    onReject={() => {
-                      notifications.show({
-                        color: 'red',
-                        autoClose: 5000,
-                        title: 'Error',
-                        message: `Failed upload file. Please make sure the file is a PDF and does not exceed 1mb.`,
-                      })
-                    }}
-                    maxSize={1 * 1024 ** 2}
-                    accept={PDF_MIME_TYPE}
-                  >
-                    <Group
-                      align='center'
-                      gap='xl'
-                      style={{ minHeight: rem(220), pointerEvents: 'none' }}
-                    >
-                      <Dropzone.Accept>
-                        <IconUpload
-                          size='3.2rem'
-                          stroke={1.5}
-                          color={theme.colors[theme.primaryColor][4]}
-                        />
-                      </Dropzone.Accept>
-                      <Dropzone.Reject>
-                        <IconX size='3.2rem' stroke={1.5} color={theme.colors.red[4]} />
-                      </Dropzone.Reject>
-                      <Dropzone.Idle>
-                        <IconPhoto size='3.2rem' stroke={1.5} />
-                      </Dropzone.Idle>
-
-                      <div>
-                        <Text size='xl' inline>
-                          Drag the file here or click to select file
-                        </Text>
-                        <Text size='sm' color='dimmed' inline mt={7}>
-                          The file should not exceed 1mb
-                        </Text>
-                      </div>
-                    </Group>
-                  </Dropzone>
-                )}
-                <Group align='left'>
-                  <Text fw={500} fz='sm'>
-                    CV
-                  </Text>
-                  <Text color='red'>*</Text>
-                </Group>
-                {uploads.values.cv && (
-                  <Card shadow='sm' withBorder>
-                    <Group align='apart'>
-                      <Text c='dimmed' fz='sm'>
-                        {uploads.values.cv.name}
-                      </Text>
-                      <ActionIcon
-                        onClick={() => {
-                          uploads.setValues({ cv: undefined })
-                        }}
-                      >
-                        <IconX />
-                      </ActionIcon>
-                    </Group>
-                  </Card>
-                )}
-                {!uploads.values.cv && (
-                  <Dropzone
-                    name='CV'
-                    disabled={!!uploads.values.cv}
-                    onDrop={(files) => {
-                      if (files[0]) {
-                        uploads.setValues({
-                          cv: files[0],
-                        })
-                      }
-                    }}
-                    onReject={() => {
-                      notifications.show({
-                        color: 'red',
-                        autoClose: 5000,
-                        title: 'Error',
-                        message: `Failed upload file. Please make sure the file is a PDF and does not exceed 1mb.`,
-                      })
-                    }}
-                    maxSize={1 * 1024 ** 2}
-                    accept={PDF_MIME_TYPE}
-                  >
-                    <Group
-                      align='center'
-                      gap='xl'
-                      style={{ minHeight: rem(220), pointerEvents: 'none' }}
-                    >
-                      <Dropzone.Accept>
-                        <IconUpload
-                          size='3.2rem'
-                          stroke={1.5}
-                          color={theme.colors[theme.primaryColor][4]}
-                        />
-                      </Dropzone.Accept>
-                      <Dropzone.Reject>
-                        <IconX size='3.2rem' stroke={1.5} color={theme.colors.red[4]} />
-                      </Dropzone.Reject>
-                      <Dropzone.Idle>
-                        <IconPhoto size='3.2rem' stroke={1.5} />
-                      </Dropzone.Idle>
-
-                      <div>
-                        <Text size='xl' inline>
-                          Drag the file here or click to select file
-                        </Text>
-                        <Text size='sm' color='dimmed' inline mt={7}>
-                          The file should not exceed 1mb
-                        </Text>
-                      </div>
-                    </Group>
-                  </Dropzone>
-                )}
-                <Text fw={500} fz='sm'>
-                  Bachelor Report
-                </Text>
-                {uploads.values.bachelorReport && (
-                  <Card shadow='sm' withBorder>
-                    <Group align='apart'>
-                      <Text c='dimmed' fz='sm'>
-                        {uploads.values.bachelorReport.name}
-                      </Text>
-                      <ActionIcon
-                        onClick={() => {
-                          uploads.setValues({ bachelorReport: undefined })
-                        }}
-                      >
-                        <IconX />
-                      </ActionIcon>
-                    </Group>
-                  </Card>
-                )}
-                {!uploads.values.bachelorReport && (
-                  <Dropzone
-                    name='Bachelor Report'
-                    disabled={!!uploads.values.bachelorReport}
-                    onDrop={(files) => {
-                      if (files[0]) {
-                        uploads.setValues({
-                          bachelorReport: files[0],
-                        })
-                      }
-                    }}
-                    onReject={() => {
-                      notifications.show({
-                        color: 'red',
-                        autoClose: 5000,
-                        title: 'Error',
-                        message: `Failed upload file. Please make sure the file is a PDF and does not exceed 1mb.`,
-                      })
-                    }}
-                    maxSize={1 * 1024 ** 2}
-                    accept={PDF_MIME_TYPE}
-                  >
-                    <Group
-                      align='center'
-                      gap='xl'
-                      style={{ minHeight: rem(220), pointerEvents: 'none' }}
-                    >
-                      <Dropzone.Accept>
-                        <IconUpload
-                          size='3.2rem'
-                          stroke={1.5}
-                          color={theme.colors[theme.primaryColor][4]}
-                        />
-                      </Dropzone.Accept>
-                      <Dropzone.Reject>
-                        <IconX size='3.2rem' stroke={1.5} color={theme.colors.red[4]} />
-                      </Dropzone.Reject>
-                      <Dropzone.Idle>
-                        <IconPhoto size='3.2rem' stroke={1.5} />
-                      </Dropzone.Idle>
-
-                      <div>
-                        <Text size='xl' inline>
-                          Drag the file here or click to select file
-                        </Text>
-                        <Text size='sm' color='dimmed' inline mt={7}>
-                          The file should not exceed 1mb
-                        </Text>
-                      </div>
-                    </Group>
-                  </Dropzone>
-                )}
-              </Stack>
-            )}
-          </form>
-          {accessMode === ApplicationFormAccessMode.INSTRUCTOR && (
-            <>
-              <Divider
-                label={
-                  <Text c='dimmed' fz='xs' fw='700'>
-                    Uploaded Files
-                  </Text>
-                }
-                labelPosition='center'
-              />
-              <Group grow>
-                {application?.examinationReportFilename && (
-                  <Button
-                    onClick={() => {
-                      void (async () => {
-                        const response = await getThesisApplicationExaminationFile(application.id)
-                        if (response) {
-                          const url = window.URL.createObjectURL(response)
-                          const a = document.createElement('a')
-                          a.href = url
-                          a.setAttribute(
-                            'download',
-                            `${application.examinationReportFilename ?? ''}.pdf`,
-                          )
-                          document.body.appendChild(a)
-                          a.click()
-                          window.URL.revokeObjectURL(url)
-                        }
-                      })()
-                    }}
-                  >
-                    Download Examination Report
-                  </Button>
-                )}
-                {application?.cvFilename && (
-                  <Button
-                    onClick={() => {
-                      void (async () => {
-                        const response = await getThesisApplicationCvFile(application.id)
-                        if (response) {
-                          const url = window.URL.createObjectURL(response)
-                          const a = document.createElement('a')
-                          a.href = url
-                          a.setAttribute('download', `${application.cvFilename ?? ''}.pdf`)
-                          document.body.appendChild(a)
-                          a.click()
-                          window.URL.revokeObjectURL(url)
-                        }
-                      })()
-                    }}
-                  >
-                    Download CV
-                  </Button>
-                )}
-                {application?.bachelorReportFilename && (
-                  <Button
-                    onClick={() => {
-                      void (async () => {
-                        const response = await getThesisApplicationBachelorReportFile(
-                          application.id,
-                        )
-                        if (response) {
-                          const url = window.URL.createObjectURL(response)
-                          const a = document.createElement('a')
-                          a.href = url
-                          a.setAttribute(
-                            'download',
-                            `${application.bachelorReportFilename ?? ''}.pdf`,
-                          )
-                          document.body.appendChild(a)
-                          a.click()
-                          window.URL.revokeObjectURL(url)
-                        }
-                      })()
-                    }}
-                  >
-                    Download Bachelor Report
-                  </Button>
-                )}
-              </Group>
-              <Divider />
-            </>
-          )}
-          {accessMode === ApplicationFormAccessMode.INSTRUCTOR && (
-            <>
-              <Select
-                label='Thesis Advisor'
-                data={thesisAdvisors.map((ta) => {
-                  return {
-                    value: ta.id ?? '',
-                    label: `${ta.firstName} ${ta.lastName} (${ta.tumId})`,
-                  }
-                })}
-                value={thesisAdvisorId}
-                onChange={(value) => {
-                  setThesisAdvisorId(value)
-                  if (application && value) {
-                    assignThesisApplicationToThesisAdvisor.mutate()
-                  }
-                }}
-              />
-              <Textarea
-                label='Comment'
-                autosize
-                minRows={5}
-                placeholder='Comment'
-                {...form.getInputProps('assessmentComment')}
-              />
-              {accessMode === ApplicationFormAccessMode.INSTRUCTOR && (
-                <Button
-                  onClick={() => {
-                    if (application) {
-                      assessThesisApplication.mutate()
-                    }
-                  }}
-                >
-                  Save
-                </Button>
-              )}
-              <Group align='right'>
-                <Button
-                  style={{ width: '20vw' }}
-                  variant='outline'
-                  color='red'
-                  disabled={rejectThesisApplication.isPending}
-                  onClick={() => {
-                    if (application) {
-                      rejectThesisApplication.mutate()
-                    }
-                  }}
-                >
-                  {rejectThesisApplication.isPending ? <Loader /> : 'Reject'}
-                </Button>
-                <Button
-                  style={{ width: '20vw' }}
-                  color='green'
-                  disabled={!application?.thesisAdvisor || acceptThesisApplication.isPending}
-                  onClick={() => {
-                    if (application) {
-                      acceptThesisApplication.mutate()
-                    }
-                  }}
-                >
-                  {acceptThesisApplication.isPending ? <Loader /> : 'Accept'}
-                </Button>
-              </Group>
-              <Group align='right'>
-                <Checkbox
-                  label='Notify student'
-                  checked={notifyStudent}
-                  onChange={(event) => setNotifyStudent(event.currentTarget.checked)}
-                />
-              </Group>
-            </>
-          )}
-          {accessMode === ApplicationFormAccessMode.STUDENT && (
-            <>
-              <Stack>
-                <Checkbox
-                  mt='md'
-                  label='I have read the declaration of consent below and agree to the processing of my data.'
-                  {...consentForm.getInputProps('declarationOfConsentAccepted', {
-                    type: 'checkbox',
-                  })}
-                />
-                <Spoiler
-                  maxHeight={0}
-                  showLabel={<Text fz='sm'>Show Declaration of Consent</Text>}
-                  hideLabel={<Text fz='sm'>Hide</Text>}
-                >
-                  <DeclarationOfDataConsent />
-                </Spoiler>
-              </Stack>
-              <Group>
-                <Button
-                  disabled={!form.isValid() || !consentForm.isValid() || !uploads.isValid()}
-                  onClick={() => {
-                    void (async () => {
-                      loadingOverlayHandlers.open()
-                      if (uploads.values.examinationReport && uploads.values.cv) {
-                        const response = await postThesisApplication({
-                          application: form.values,
-                          examinationReport: uploads.values.examinationReport,
-                          cv: uploads.values.cv,
-                          bachelorReport: uploads.values.bachelorReport,
-                        })
-                        if (response) {
-                          setApplicationSuccessfullySubmitted(true)
-                        }
-                      }
-                    })().then(() => {
-                      loadingOverlayHandlers.close()
-                    })
-                  }}
-                >
-                  Submit
-                </Button>
-              </Group>
-            </>
-          )}
-        </Stack>
-      )}
-    </Box>
-  )
-}
diff --git a/client/src/interface/thesisApplication.ts b/client/src/interface/thesisApplication.ts
deleted file mode 100644
index a1564bac..00000000
--- a/client/src/interface/thesisApplication.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ApplicationStatus, Student, StudyDegree, StudyProgram } from '../interface/application'
-
-export enum ResearchArea {
-  EDUCATION_TECHNOLOGIES = 'Education Technologies',
-  HUMAN_COMPUTER_INTERACTION = 'Human Computer Interaction',
-  ROBOTIC = 'Robotic',
-  SOFTWARE_ENGINEERING = 'Software Engineering',
-}
-
-export enum FocusTopic {
-  COMPETENCIES = 'Competencies',
-  TEAM_BASED_LEARNING = 'Team-based Learning',
-  AUTOMATIC_ASSESSMENT = 'Automatic Assessment',
-  LEARNING_PLATFORMS = 'Learning Platforms',
-  MACHINE_LEARNING = 'Machine Learning',
-  DEI = 'Diversity, Equity & Inclusion',
-  LEARNING_ANALYTICS = 'Learning Analytics',
-  ADAPTIVE_LEARNING = 'Adaptive Learning',
-  K12_SCHOOLS = 'K12 / Schools',
-  SECURITY = 'Security',
-  INFRASTRUCTURE = 'Infrastructure',
-  AGILE_DEVELOPMENT = 'Agile Development',
-  MOBILE_DEVELOPMENT = 'Mobile Development',
-  CONTINUOUS = 'Continuous *',
-  MODELING = 'Modeling',
-  INNOVATION = 'Innovation',
-  PROJECT_COURSES = 'Project Courses',
-  DISTRIBUTED_SYSTEMS = 'Distributed Systems',
-  DEPLOYMENT = 'Deployment',
-  DEV_OPS = 'DevOps',
-  INTERACTION_DESIGN = 'Interaction Design',
-  USER_INVOLVEMENT = 'User Involvement',
-  USER_EXPERIENCE = 'User Experience',
-  CREATIVITY = 'Creativity',
-  USER_MODEL = 'User Model',
-  INTERACTIVE_TECHNOLOGY = 'Interactive Technology',
-  MOCK_UPS = 'Mock-ups',
-  PROTOTYPING = 'Prototyping',
-  EMBEDDED_SYSTEMS = 'Embedded Systems',
-  DUCKIETOWN = 'Duckietown',
-  AUTONOMOUS_DRIVING = 'Autonomous Driving',
-  COMMUNICATION = 'Communication',
-  DISTRIBUTED_CONTROL = 'Distributed Control',
-  LEARNING_AUTONOMY = 'Learning Autonomy',
-  HW_SW_CO_DESIGN = 'HW/SW Co-Design',
-}
-
-export interface ThesisAdvisor {
-  id?: string
-  firstName: string
-  lastName: string
-  email: string
-  tumId: string
-}
-
-export interface ThesisApplication {
-  id: string
-  student: Student
-  studyProgram?: StudyProgram
-  studyDegree?: StudyDegree
-  currentSemester?: string
-  start: string
-  specialSkills: string
-  researchAreas: ResearchArea[]
-  focusTopics: FocusTopic[]
-  motivation: string
-  interests: string
-  projects: string
-  thesisTitle: string
-  desiredThesisStart: Date
-  examinationReportFilename?: string
-  cvFilename?: string
-  bachelorReportFilename?: string
-  applicationStatus: keyof typeof ApplicationStatus
-  assessmentComment?: string
-  createdAt?: Date
-  thesisAdvisor?: ThesisAdvisor
-}
diff --git a/client/src/management/MailingManagement/MailingManagementConsole.tsx b/client/src/management/MailingManagement/MailingManagementConsole.tsx
index 98df5c76..af252dc1 100644
--- a/client/src/management/MailingManagement/MailingManagementConsole.tsx
+++ b/client/src/management/MailingManagement/MailingManagementConsole.tsx
@@ -24,14 +24,10 @@ import { IconEyeCheck, IconHtml, IconInfoCircle } from '@tabler/icons-react'
 import {
   StudentAndCourseIterationInstructions,
   StudentAndCourseIterationAndDeveloperApplicationInstructions,
-  ThesisApplicationAndStudentAndThesisAdvisorInstructions,
-  ThesisApplicationAndStudentInstructions,
   StudentAndCourseIterationAndCoachApplicationInstructions,
   StudentAndCourseIterationAndTutorApplicationInstructions,
   fillMockStudentPlaceholders,
   fillMockCourseIterationPlaceholders,
-  fillMockThesisAdvisorPlaceholders,
-  fillMockThesisApplicationPlaceholders,
   fillDeveloperApplicationPlaceholders,
   fillMockCoachApplicationPlaceholders,
   fillMockTutorApplicationPlaceholders,
@@ -71,21 +67,6 @@ export const MailingManagementConsole = (): JSX.Element => {
     if (activeTab === 'preview') {
       let preview = fillMockStudentPlaceholders(editor?.getHTML() ?? '')
       preview = fillMockCourseIterationPlaceholders(preview)
-      if (
-        MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-          MailTemplate.THESIS_APPLICATION_CONFIRMATION ||
-        MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-          MailTemplate.THESIS_APPLICATION_CREATED ||
-        MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-          MailTemplate.THESIS_APPLICATION_ACCEPTANCE ||
-        MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-          MailTemplate.THESIS_APPLICATION_REJECTION ||
-        MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-          MailTemplate.THESIS_APPLICATION_ACCEPTANCE_NO_ADVISOR
-      ) {
-        preview = fillMockThesisAdvisorPlaceholders(preview)
-        preview = fillMockThesisApplicationPlaceholders(preview)
-      }
       if (
         MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
           MailTemplate.DEVELOPER_APPLICATION_CONFIRMATION ||
@@ -190,20 +171,6 @@ export const MailingManagementConsole = (): JSX.Element => {
             MailTemplate.TUTOR_APPLICATION_CONFIRMATION && (
             <StudentAndCourseIterationAndTutorApplicationInstructions />
           )}
-          {(MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-            MailTemplate.THESIS_APPLICATION_ACCEPTANCE_NO_ADVISOR ||
-            MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-              MailTemplate.THESIS_APPLICATION_REJECTION ||
-            MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-              MailTemplate.THESIS_APPLICATION_CONFIRMATION ||
-            MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-              MailTemplate.THESIS_APPLICATION_CREATED) && (
-            <ThesisApplicationAndStudentInstructions />
-          )}
-          {MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-            MailTemplate.THESIS_APPLICATION_ACCEPTANCE && (
-            <ThesisApplicationAndStudentAndThesisAdvisorInstructions />
-          )}
         </Card>
       </Collapse>
       <Tabs
diff --git a/client/src/management/MailingManagement/components/TemplateInstructions.tsx b/client/src/management/MailingManagement/components/TemplateInstructions.tsx
index 07fbd075..fdb0c105 100644
--- a/client/src/management/MailingManagement/components/TemplateInstructions.tsx
+++ b/client/src/management/MailingManagement/components/TemplateInstructions.tsx
@@ -8,7 +8,6 @@ import {
   StudyProgram,
 } from '../../../interface/application'
 import moment from 'moment'
-import { FocusTopic, ResearchArea } from '../../../interface/thesisApplication'
 
 const mockStudent = {
   publicId: '9002767c-3247-49bc-9cc9-aadb1bbbc9ca',
@@ -43,28 +42,6 @@ const mockCourseIteration = {
   kickoffSubmissionPeriodStart: '2023-11-17',
 }
 
-const mockThesisAdvisor = {
-  firstName: 'Max',
-  lastName: 'Mustermann',
-  email: 'max.mustermann@example.com',
-  tumId: 'aa11aaa',
-}
-
-const mockThesisApplication = {
-  currentSemester: '4',
-  studyDegree: StudyDegree.BACHELOR,
-  studyProgram: StudyProgram.COMPUTER_SCIENCE,
-  thesisTitle: 'Exploring Applications of Artificial Intelligence in Web Development',
-  desiredThesisStart: '2023-09-01',
-  interests: 'Artificial Intelligence, Web Development, Machine Learning',
-  projects: 'Developed a chatbot using Python, Implemented a web application using React',
-  specialSkills: 'Python, JavaScript, React, Machine Learning',
-  motivation:
-    'I am deeply interested in exploring how AI can be leveraged to enhance user experience on the web.',
-  researchAreas: [ResearchArea.EDUCATION_TECHNOLOGIES, ResearchArea.ROBOTIC],
-  focusTopics: [FocusTopic.ADAPTIVE_LEARNING, FocusTopic.COMMUNICATION],
-}
-
 const mockDeveloperApplication = {
   currentSemester: '3',
   studyDegree: StudyDegree.BACHELOR,
@@ -177,34 +154,6 @@ export const fillMockCourseIterationPlaceholders = (template: string): string =>
     )
 }
 
-export const fillMockThesisAdvisorPlaceholders = (template: string): string => {
-  return template
-    .replace(/{{advisor.firstName}}/g, mockThesisAdvisor.firstName)
-    .replace(/{{advisor.lastName}}/g, mockThesisAdvisor.lastName)
-    .replace(/{{advisor.email}}/g, mockThesisAdvisor.email)
-    .replace(/{{advisor.tumId}}/g, mockThesisAdvisor.tumId)
-}
-
-export const fillMockThesisApplicationPlaceholders = (template: string): string => {
-  const pattern = 'DD. MMM YYYY'
-
-  return template
-    .replace(/{{application.studyProgram}}/g, mockThesisApplication.studyProgram)
-    .replace(/{{application.studyDegree}}/g, mockThesisApplication.studyDegree)
-    .replace(/{{application.currentSemester}}/g, mockThesisApplication.currentSemester.toString())
-    .replace(
-      /{{application.desiredThesisStart}}/g,
-      moment(mockThesisApplication.desiredThesisStart).format(pattern),
-    )
-    .replace(/{{application.specialSkills}}/g, mockThesisApplication.specialSkills)
-    .replace(/{{application.motivation}}/g, mockThesisApplication.motivation)
-    .replace(/{{application.interests}}/g, mockThesisApplication.interests)
-    .replace(/{{application.projects}}/g, mockThesisApplication.projects)
-    .replace(/{{application.thesisTitle}}/g, mockThesisApplication.thesisTitle)
-    .replace(/{{application.researchAreas}}/g, mockThesisApplication.researchAreas.join(', '))
-    .replace(/{{application.focusTopics}}/g, mockThesisApplication.focusTopics.join(', '))
-}
-
 export const fillDeveloperApplicationPlaceholders = (template: string): string => {
   return template
     .replace(/{{application.studyDegree}}/g, mockDeveloperApplication.studyDegree)
@@ -324,60 +273,6 @@ const studentElements = [
   },
 ]
 
-const thesisAdvisorElements = [
-  { accessor: 'advisor.firstName', description: "Advisor's first name" },
-  { accessor: 'advisor.lastName', description: "Advisor's last name" },
-  { accessor: 'advisor.email', description: "Advisor's email" },
-  { accessor: 'advisor.tumId', description: "Advisors's TUM ID" },
-]
-
-const thesisApplicationElements = [
-  {
-    accessor: 'application.currentSemester',
-    description: 'Current semester in which the referred student submitted the application',
-  },
-  {
-    accessor: 'application.studyDegree',
-    description: "Student's study degree",
-  },
-  {
-    accessor: 'application.studyProgram',
-    description: "Student's study program",
-  },
-  {
-    accessor: 'application.thesisTitle',
-    description: 'Thesis title suggestion',
-  },
-  {
-    accessor: 'application.desiredThesisStart',
-    description: 'Desired start date of the thesis',
-  },
-  {
-    accessor: 'application.interests',
-    description: 'Interests stated by the referred student',
-  },
-  {
-    accessor: 'application.projects',
-    description: 'Projects the referred student states to have been working on',
-  },
-  {
-    accessor: 'application.specialSkills',
-    description: "Student's special skills",
-  },
-  {
-    accessor: 'application.motivation',
-    description: 'Motivation for the thesis application',
-  },
-  {
-    accessor: 'application.researchAreas',
-    description: 'Research areas stated by the referred student',
-  },
-  {
-    accessor: 'application.focusTopics',
-    description: 'Focus topics stated by the referred student',
-  },
-]
-
 const developerApplicationElements = [
   {
     accessor: 'application.currentSemester',
@@ -486,50 +381,6 @@ const tutorApplicationElements = [
   },
 ]
 
-export const ThesisApplicationAndStudentInstructions = (): JSX.Element => {
-  const rows = [...studentElements, ...thesisApplicationElements].map((element) => (
-    <tr key={element.accessor}>
-      <td>{element.accessor}</td>
-      <td>{element.description}</td>
-    </tr>
-  ))
-
-  return (
-    <Table verticalSpacing='xs' fz='xs'>
-      <thead>
-        <tr>
-          <th>Accessor</th>
-          <th>Description</th>
-        </tr>
-      </thead>
-      <tbody>{rows}</tbody>
-    </Table>
-  )
-}
-
-export const ThesisApplicationAndStudentAndThesisAdvisorInstructions = (): JSX.Element => {
-  const rows = [...studentElements, ...thesisApplicationElements, ...thesisAdvisorElements].map(
-    (element) => (
-      <tr key={element.accessor}>
-        <td>{element.accessor}</td>
-        <td>{element.description}</td>
-      </tr>
-    ),
-  )
-
-  return (
-    <Table verticalSpacing='xs' fz='xs'>
-      <thead>
-        <tr>
-          <th>Accessor</th>
-          <th>Description</th>
-        </tr>
-      </thead>
-      <tbody>{rows}</tbody>
-    </Table>
-  )
-}
-
 export const StudentAndCourseIterationInstructions = (): JSX.Element => {
   const rows = [...studentElements, ...courseIterationElements].map((element) => (
     <tr key={element.accessor}>
diff --git a/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.module.scss b/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.module.scss
deleted file mode 100644
index 1019f3b8..00000000
--- a/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.module.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
-  padding: 0 0 5vh 0;
-}
diff --git a/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.tsx b/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.tsx
deleted file mode 100644
index 5ec84122..00000000
--- a/client/src/management/ThesisApplicationsManagement/ThesisApplicationsManagementConsole.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import Keycloak from 'keycloak-js'
-import { axiosInstance, keycloakRealmName, keycloakUrl } from '../../network/configService'
-import { useEffect, useState } from 'react'
-import { jwtDecode } from 'jwt-decode'
-import { ThesisApplicationsDatatable } from './components/ThesisApplicationsDatatable'
-import { Affix, Button, Center, Transition, rem } from '@mantine/core'
-import { IconArrowUp } from '@tabler/icons-react'
-import { useWindowScroll } from '@mantine/hooks'
-import * as styles from './ThesisApplicationsManagementConsole.module.scss'
-import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { putThesisAdvisor } from '../../network/thesisApplication'
-import { ThesisAdvisor } from '../../interface/thesisApplication'
-import { Query } from '../../state/query'
-import { useAuthenticationStore } from '../../state/zustand/useAuthenticationStore'
-
-export const ThesisApplicationsManagementConsole = (): JSX.Element => {
-  const queryClient = useQueryClient()
-  const [scroll, scrollTo] = useWindowScroll()
-  const [authenticated, setAuthenticated] = useState(false)
-  const { user, setUser } = useAuthenticationStore()
-
-  const addThesisAdvisor = useMutation({
-    mutationFn: (thesisAdvisor: ThesisAdvisor) => putThesisAdvisor(thesisAdvisor),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: [Query.THESIS_APPLICATION] })
-    },
-  })
-
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const keycloak = new Keycloak({
-    realm: keycloakRealmName,
-    url: keycloakUrl,
-    clientId: 'prompt-client',
-  })
-  const [keycloakValue, setKeycloakValue] = useState<Keycloak>(keycloak)
-
-  useEffect(() => {
-    if (keycloakValue) {
-      axiosInstance.interceptors.request.use(
-        async (config) => {
-          if (keycloakValue.isTokenExpired(43200)) {
-            await keycloakValue?.updateToken(60)
-          }
-          return config
-        },
-        (error) => {
-          Promise.reject(error)
-        },
-      )
-    }
-  }, [keycloakValue])
-
-  useEffect(() => {
-    void keycloak
-      .init({ onLoad: 'login-required' })
-      .then((isAuthenticated) => {
-        if (isAuthenticated) {
-          setAuthenticated(true)
-        } else {
-          setAuthenticated(false)
-          void keycloak.login()
-        }
-        localStorage.setItem('jwt_token', keycloak.token ?? '')
-        localStorage.setItem('refreshToken', keycloak.refreshToken ?? '')
-        try {
-          if (keycloak.token) {
-            const decodedJwt = jwtDecode<{
-              given_name: string
-              family_name: string
-              email: string
-              preferred_username: string
-            }>(keycloak.token)
-            setUser({
-              firstName: decodedJwt.given_name,
-              lastName: decodedJwt.family_name,
-              email: decodedJwt.email,
-              username: decodedJwt.preferred_username,
-              mgmtAccess:
-                keycloak.hasResourceRole('chair-member', 'prompt-server') ||
-                keycloak.hasResourceRole('prompt-admin', 'prompt-server'),
-            })
-
-            if (keycloak.hasResourceRole('chair-member', 'prompt-server')) {
-              addThesisAdvisor.mutate({
-                firstName: decodedJwt.given_name,
-                lastName: decodedJwt.family_name,
-                email: decodedJwt.email,
-                tumId: decodedJwt.preferred_username,
-              })
-            }
-          }
-        } catch (error) {
-          setUser({
-            firstName: '',
-            lastName: '',
-            email: '',
-            username: '',
-            mgmtAccess: false,
-          })
-        }
-        setKeycloakValue(keycloak)
-      })
-      .catch((err) => {
-        alert(err)
-      })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return (
-    <div className={styles.root}>
-      {authenticated && user && user.mgmtAccess && (
-        <Center>
-          <ThesisApplicationsDatatable />
-          <Affix position={{ bottom: 20, right: 20 }}>
-            <Transition transition='slide-up' mounted={scroll.y > 0}>
-              {(transitionStyles) => (
-                <Button
-                  leftSection={<IconArrowUp style={{ width: rem(16), height: rem(16) }} />}
-                  style={transitionStyles}
-                  onClick={() => scrollTo({ y: 0 })}
-                >
-                  Scroll to top
-                </Button>
-              )}
-            </Transition>
-          </Affix>
-        </Center>
-      )}
-    </div>
-  )
-}
diff --git a/client/src/management/ThesisApplicationsManagement/components/ThesisApplicationsDatatable.tsx b/client/src/management/ThesisApplicationsManagement/components/ThesisApplicationsDatatable.tsx
deleted file mode 100644
index 002c81f4..00000000
--- a/client/src/management/ThesisApplicationsManagement/components/ThesisApplicationsDatatable.tsx
+++ /dev/null
@@ -1,307 +0,0 @@
-import { useEffect, useState } from 'react'
-import sortBy from 'lodash/sortBy'
-import { ActionIcon, Badge, Group, Modal, MultiSelect, Stack, TextInput } from '@mantine/core'
-import { DataTable, type DataTableSortStatus } from 'mantine-datatable'
-import { useAutoAnimate } from '@formkit/auto-animate/react'
-import { IconExternalLink, IconEyeEdit, IconSearch } from '@tabler/icons-react'
-import { ThesisApplicationForm } from '../../../forms/ThesisApplicationForm'
-import { ApplicationFormAccessMode } from '../../../forms/DefaultApplicationForm'
-import moment from 'moment'
-import { Link, useNavigate, useParams } from 'react-router-dom'
-import { useThesisApplicationStore } from '../../../state/zustand/useThesisApplicationStore'
-import { useQuery } from '@tanstack/react-query'
-import { Query } from '../../../state/query'
-import { getThesisAdvisors, getThesisApplications } from '../../../network/thesisApplication'
-import { ThesisAdvisor, ThesisApplication } from '../../../interface/thesisApplication'
-import { ApplicationStatus, Gender } from '../../../interface/application'
-
-interface Filters {
-  male: boolean
-  female: boolean
-  status: string[]
-}
-
-export const ThesisApplicationsDatatable = (): JSX.Element => {
-  const { applicationId } = useParams()
-  const navigate = useNavigate()
-  const { thesisApplications, setThesisApplications, setThesisAdvisors } =
-    useThesisApplicationStore()
-  const [bodyRef] = useAutoAnimate<HTMLTableSectionElement>()
-  const [searchQuery, setSearchQuery] = useState('')
-  const [tablePage, setTablePage] = useState(1)
-  const [totalDisplayedRecords, setTotalDisplayedRecords] = useState(thesisApplications.length)
-  const [tablePageSize, setTablePageSize] = useState(20)
-  const [tableRecords, setTableRecords] = useState<ThesisApplication[]>([])
-  const [selectedTableRecords, setSelectedTableRecords] = useState<ThesisApplication[]>([])
-  const [selectedApplicationToView, setSelectedApplicationToView] = useState<
-    ThesisApplication | undefined
-  >(undefined)
-  const [sortStatus, setSortStatus] = useState<DataTableSortStatus<ThesisApplication>>({
-    columnAccessor: 'createdAt',
-    direction: 'desc',
-  })
-  const [filters, setFilters] = useState<Filters>({
-    male: false,
-    female: false,
-    status: [],
-  })
-
-  const { data: fetchedThesisApplications, isLoading } = useQuery<ThesisApplication[]>({
-    queryKey: [Query.THESIS_APPLICATION],
-    queryFn: () => getThesisApplications(),
-  })
-
-  useEffect(() => {
-    if (fetchedThesisApplications) {
-      setThesisApplications(fetchedThesisApplications)
-    }
-  }, [fetchedThesisApplications, setThesisApplications])
-
-  const { data: fetchedThesisAdvisors } = useQuery<ThesisAdvisor[]>({
-    queryKey: [Query.THESIS_ADVISOR],
-    queryFn: () => getThesisAdvisors(),
-  })
-
-  useEffect(() => {
-    if (fetchedThesisAdvisors) {
-      setThesisAdvisors(fetchedThesisAdvisors)
-    }
-  }, [fetchedThesisAdvisors, setThesisAdvisors])
-
-  useEffect(() => {
-    if (applicationId) {
-      setSelectedApplicationToView(thesisApplications.find((a) => a.id === applicationId))
-    } else {
-      setSelectedApplicationToView(undefined)
-    }
-  }, [thesisApplications, applicationId])
-
-  useEffect(() => {
-    const from = (tablePage - 1) * tablePageSize
-    const to = from + tablePageSize
-
-    const filteredSortedData = sortBy(
-      thesisApplications
-        .filter(({ student }) => {
-          return `${student.firstName ?? ''} ${student.lastName ?? ''} ${student.tumId ?? ''} ${
-            student.matriculationNumber ?? ''
-          }`
-            .toLowerCase()
-            .includes(searchQuery.toLowerCase())
-        })
-        .filter(
-          (application) =>
-            filters.status.length === 0 || filters.status.includes(application.applicationStatus),
-        )
-        .filter((application) =>
-          filters.female && application.student.gender
-            ? Gender[application.student.gender] === Gender.FEMALE
-            : true,
-        )
-        .filter((application) =>
-          filters.male && application.student.gender
-            ? Gender[application.student.gender] === Gender.MALE
-            : true,
-        ),
-      sortStatus.columnAccessor === 'fullName'
-        ? ['student.firstName', 'student.lastName']
-        : sortStatus.columnAccessor,
-    )
-
-    setTotalDisplayedRecords(filteredSortedData.length)
-
-    setTableRecords(
-      (sortStatus.direction === 'desc' ? filteredSortedData.reverse() : filteredSortedData).slice(
-        from,
-        to,
-      ),
-    )
-    if (from > filteredSortedData.length) {
-      setTablePage(1)
-    }
-
-    if (selectedApplicationToView) {
-      setSelectedApplicationToView(
-        thesisApplications.filter((ca) => ca.id === selectedApplicationToView.id).at(0),
-      )
-    }
-  }, [
-    thesisApplications,
-    tablePageSize,
-    tablePage,
-    searchQuery,
-    filters,
-    sortStatus,
-    selectedApplicationToView,
-  ])
-
-  return (
-    <Stack>
-      {selectedApplicationToView && (
-        <Modal
-          centered
-          size='90%'
-          opened={!!selectedApplicationToView}
-          onClose={() => {
-            navigate('/management/thesis-applications')
-            setSelectedApplicationToView(undefined)
-          }}
-        >
-          <ThesisApplicationForm
-            application={selectedApplicationToView}
-            accessMode={ApplicationFormAccessMode.INSTRUCTOR}
-          />
-        </Modal>
-      )}
-      <TextInput
-        style={{ margin: '1vh 0', width: '30vw' }}
-        placeholder='Search applications...'
-        leftSection={<IconSearch size={16} />}
-        value={searchQuery}
-        onChange={(e) => {
-          setSearchQuery(e.currentTarget.value)
-        }}
-      />
-      <DataTable
-        fetching={isLoading}
-        withTableBorder
-        minHeight={200}
-        noRecordsText='No records to show'
-        borderRadius='sm'
-        verticalSpacing='md'
-        striped
-        highlightOnHover
-        totalRecords={totalDisplayedRecords}
-        recordsPerPage={tablePageSize}
-        page={tablePage}
-        onPageChange={(page) => {
-          setTablePage(page)
-        }}
-        recordsPerPageOptions={[5, 10, 15, 20, 25, 30, 35, 40, 50, 100, 200, 300]}
-        onRecordsPerPageChange={(pageSize) => {
-          setTablePageSize(pageSize)
-        }}
-        sortStatus={sortStatus}
-        onSortStatusChange={setSortStatus}
-        bodyRef={bodyRef}
-        records={tableRecords}
-        selectedRecords={selectedTableRecords}
-        onSelectedRecordsChange={setSelectedTableRecords}
-        columns={[
-          {
-            accessor: 'application_status',
-            title: 'Status',
-            textAlign: 'center',
-            filter: (
-              <MultiSelect
-                label='Status'
-                description='Show all applications having status in'
-                data={Object.keys(ApplicationStatus).map((key) => {
-                  return {
-                    label: ApplicationStatus[key as keyof typeof ApplicationStatus],
-                    value: key,
-                  }
-                })}
-                value={filters.status}
-                placeholder='Search status...'
-                onChange={(value) => {
-                  setFilters({
-                    ...filters,
-                    status: value,
-                  })
-                }}
-                leftSection={<IconSearch size={16} />}
-                clearable
-                searchable
-              />
-            ),
-            filtering: filters.status.length > 0,
-            render: (application) => {
-              let color: string = 'gray'
-              switch (application.applicationStatus) {
-                case 'ACCEPTED':
-                  color = 'green'
-                  break
-                case 'ENROLLED':
-                  color = 'green'
-                  break
-                case 'REJECTED':
-                  color = 'red'
-                  break
-                default:
-                  break
-              }
-              return <Badge color={color}>{ApplicationStatus[application.applicationStatus]}</Badge>
-            },
-          },
-          {
-            accessor: 'student.tumId',
-            title: 'TUM ID',
-            sortable: true,
-          },
-          {
-            accessor: 'student.matriculationNumber',
-            title: 'Matriculation Nr.',
-            sortable: true,
-          },
-          {
-            accessor: 'student.email',
-            title: 'Email',
-            sortable: true,
-          },
-          {
-            accessor: 'fullName',
-            title: 'Full name',
-            sortable: true,
-            render: (application) =>
-              `${application.student.firstName ?? ''} ${application.student.lastName ?? ''}`,
-          },
-          {
-            accessor: 'createdAt',
-            title: 'Created At',
-            sortable: true,
-            render: (application) =>
-              `${moment(application.createdAt).format('DD. MMMM YYYY HH:mm')}`,
-          },
-          {
-            accessor: 'actions',
-            title: 'Actions',
-            textAlign: 'right',
-            render: (application) => (
-              <Group justify='flex-end' wrap='nowrap'>
-                <ActionIcon
-                  variant='transparent'
-                  color='blue'
-                  onClick={(e: React.MouseEvent) => {
-                    e.stopPropagation()
-                    navigate(`/management/thesis-applications/${application.id}`)
-                  }}
-                >
-                  <IconEyeEdit size={16} />
-                </ActionIcon>
-                <Link
-                  to={`/management/thesis-applications/${application.id}`}
-                  target='_blank'
-                  rel='noopener noreferrer'
-                >
-                  <ActionIcon
-                    variant='transparent'
-                    color='blue'
-                    onClick={(e: React.MouseEvent) => {
-                      e.stopPropagation()
-                    }}
-                  >
-                    <IconExternalLink size={16} />
-                  </ActionIcon>
-                </Link>
-              </Group>
-            ),
-          },
-        ]}
-        onRowClick={({ record: application }) => {
-          navigate(`/management/thesis-applications/${application.id}`)
-        }}
-      />
-    </Stack>
-  )
-}
diff --git a/client/src/network/mailingService.ts b/client/src/network/mailingService.ts
index ace9cf22..0f33d2d5 100644
--- a/client/src/network/mailingService.ts
+++ b/client/src/network/mailingService.ts
@@ -14,11 +14,6 @@ export enum MailTemplate {
   TUTOR_INTERVIEW_INVITATION = 'tutor-interview-invitation',
   TECHNICAL_DETAILS_SUBMISSION_INVIATION = 'technical-details-submission-invitation',
   KICK_OFF_SUBMISSION_INVITATION = 'kick-off-submission-invitation',
-  THESIS_APPLICATION_CONFIRMATION = 'thesis-application-confirmation',
-  THESIS_APPLICATION_CREATED = 'thesis-application-created',
-  THESIS_APPLICATION_ACCEPTANCE = 'thesis-application-acceptance',
-  THESIS_APPLICATION_ACCEPTANCE_NO_ADVISOR = 'thesis-application-acceptance-no-advisor',
-  THESIS_APPLICATION_REJECTION = 'thesis-application-rejection',
 }
 
 export const fetchMailTemplate = async (template: any): Promise<string | undefined> => {
diff --git a/client/src/network/thesisApplication.ts b/client/src/network/thesisApplication.ts
deleted file mode 100644
index dbdf2db7..00000000
--- a/client/src/network/thesisApplication.ts
+++ /dev/null
@@ -1,305 +0,0 @@
-import { notifications } from '@mantine/notifications'
-import { axiosInstance, notAuthenticatedAxiosInstance } from './configService'
-import { ThesisAdvisor, ThesisApplication } from '../interface/thesisApplication'
-import { AxiosError } from 'axios'
-import { ApplicationStatus } from '../interface/application'
-
-export const getThesisApplications = async (): Promise<ThesisApplication[]> => {
-  try {
-    return (await axiosInstance.get(`/api/thesis-applications`)).data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not fetch thesis applications.`,
-    })
-    return []
-  }
-}
-
-export const postThesisApplication = async ({
-  application,
-  examinationReport,
-  cv,
-  bachelorReport,
-}: {
-  application: ThesisApplication
-  examinationReport: File
-  cv: File
-  bachelorReport?: File
-}): Promise<ThesisApplication | undefined> => {
-  try {
-    const formData = new FormData()
-    formData.append(
-      'thesisApplication',
-      new Blob([JSON.stringify(application)], { type: 'application/json' }),
-    )
-    formData.append('examinationReport', examinationReport)
-    formData.append('cv', cv)
-    if (bachelorReport) {
-      formData.append('bachelorReport', bachelorReport)
-    }
-    const response = await notAuthenticatedAxiosInstance.post(
-      `/api/thesis-applications`,
-      formData,
-      {
-        headers: {
-          'Content-Type': 'multipart/form-data',
-        },
-      },
-    )
-    if (response.status >= 200 && response.status < 300) {
-      notifications.show({
-        color: 'green',
-        autoClose: 5000,
-        title: 'Success',
-        message: `Your application was successfully submitted!`,
-      })
-    }
-    return response.data
-  } catch (err) {
-    if ((err as AxiosError)?.response?.status === 400) {
-      notifications.show({
-        color: 'red',
-        autoClose: 10000,
-        title: 'Error',
-        message: `${((err as AxiosError)?.response?.data as string) ?? ''}`,
-      })
-    } else {
-      notifications.show({
-        color: 'red',
-        autoClose: 10000,
-        title: 'Error',
-        message: `Failed to submit the application. Server responded with ${err as string}`,
-      })
-    }
-
-    return undefined
-  }
-}
-
-export const postThesisApplicationAssessment = async (
-  thesisApplicationId: string,
-  assessment: { status: keyof typeof ApplicationStatus; assessmentComment: string },
-): Promise<ThesisApplication | undefined> => {
-  try {
-    return (
-      await axiosInstance.post(`/api/thesis-applications/${thesisApplicationId}/assessment`, {
-        ...assessment,
-      })
-    ).data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not assess thesis application.`,
-    })
-    return undefined
-  }
-}
-
-export const postThesisApplicatioAcceptance = async (
-  thesisApplicationId: string,
-  notifyStudent: boolean,
-): Promise<ThesisApplication | undefined> => {
-  try {
-    const response = await axiosInstance.post(
-      `/api/thesis-applications/${thesisApplicationId}/accept`,
-      {},
-      {
-        params: {
-          notifyStudent,
-        },
-      },
-    )
-
-    if (response) {
-      notifications.show({
-        color: 'green',
-        autoClose: 5000,
-        title: 'Success',
-        message: notifyStudent
-          ? `Sent an acceptance mail successfully.`
-          : 'Application status updated successfully',
-      })
-    }
-
-    return response.data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 5000,
-      title: 'Error',
-      message: notifyStudent
-        ? `Failed to send an acceptance mail.`
-        : 'Failed to update application status',
-    })
-    return undefined
-  }
-}
-
-export const postThesisApplicationRejection = async (
-  thesisApplicationId: string,
-  notifyStudent: boolean,
-): Promise<ThesisApplication | undefined> => {
-  try {
-    const response = await axiosInstance.post(
-      `/api/thesis-applications/${thesisApplicationId}/reject`,
-      {},
-      {
-        params: {
-          notifyStudent,
-        },
-      },
-    )
-
-    if (response) {
-      notifications.show({
-        color: 'green',
-        autoClose: 5000,
-        title: 'Success',
-        message: notifyStudent
-          ? `Sent a rejection mail successfully.`
-          : 'Application status updated successfully',
-      })
-    }
-
-    return response.data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 5000,
-      title: 'Error',
-      message: notifyStudent
-        ? `Failed to send a rejection mail.`
-        : 'Failed to update application status',
-    })
-    return undefined
-  }
-}
-
-export const getThesisAdvisors = async (): Promise<ThesisAdvisor[]> => {
-  try {
-    return (await axiosInstance.get(`/api/thesis-applications/thesis-advisors`)).data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not fetch thesis advisors.`,
-    })
-    return []
-  }
-}
-
-export const putThesisAdvisor = async (
-  thesisAdvisor: ThesisAdvisor,
-): Promise<ThesisAdvisor | undefined> => {
-  try {
-    return (await axiosInstance.put(`/api/thesis-applications/thesis-advisors`, thesisAdvisor)).data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not add thesis advisor.`,
-    })
-    return undefined
-  }
-}
-
-export const postThesisApplicationThesisAdvisorAssignment = async (
-  thesisApplicationId: string,
-  thesisAdvisorId: string,
-): Promise<ThesisApplication | undefined> => {
-  try {
-    return (
-      await axiosInstance.post(
-        `/api/thesis-applications/${thesisApplicationId}/thesis-advisor/${thesisAdvisorId}`,
-        {},
-      )
-    ).data
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not assign thesis advisor to thesis application.`,
-    })
-    return undefined
-  }
-}
-
-export const getThesisApplicationExaminationFile = async (
-  thesisApplicationId: string,
-): Promise<Blob | undefined> => {
-  try {
-    const response = await axiosInstance.get(
-      `/api/thesis-applications/${thesisApplicationId}/examination-report`,
-      {
-        responseType: 'blob',
-      },
-    )
-    if (response) {
-      return new Blob([response.data], { type: 'application/pdf' })
-    }
-    return undefined
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not load examination file.`,
-    })
-    return undefined
-  }
-}
-
-export const getThesisApplicationCvFile = async (
-  thesisApplicationId: string,
-): Promise<Blob | undefined> => {
-  try {
-    const response = await axiosInstance.get(`/api/thesis-applications/${thesisApplicationId}/cv`, {
-      responseType: 'blob',
-    })
-    if (response) {
-      return new Blob([response.data], { type: 'application/pdf' })
-    }
-    return undefined
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not load cv file.`,
-    })
-    return undefined
-  }
-}
-
-export const getThesisApplicationBachelorReportFile = async (
-  thesisApplicationId: string,
-): Promise<Blob | undefined> => {
-  try {
-    const response = await axiosInstance.get(
-      `/api/thesis-applications/${thesisApplicationId}/bachelor-report`,
-      {
-        responseType: 'blob',
-      },
-    )
-    if (response) {
-      return new Blob([response.data], { type: 'application/pdf' })
-    }
-    return undefined
-  } catch (err) {
-    notifications.show({
-      color: 'red',
-      autoClose: 10000,
-      title: 'Error',
-      message: `Could not load bachelor report file.`,
-    })
-    return undefined
-  }
-}
diff --git a/client/src/state/query.ts b/client/src/state/query.ts
index 130c8fef..0ec1856d 100644
--- a/client/src/state/query.ts
+++ b/client/src/state/query.ts
@@ -1,7 +1,5 @@
 export enum Query {
   AUTHENTICATION = 'authentication',
-  THESIS_APPLICATION = 'thesisApplication',
-  THESIS_ADVISOR = 'thesisAdvisor',
   DEVELOPER_APPLICATION = 'developerApplication',
   COACH_APPLICATION = 'coachApplication',
   TUTOR_APPLICATION = 'tutorApplication',
diff --git a/client/src/state/zustand/useThesisApplicationStore.ts b/client/src/state/zustand/useThesisApplicationStore.ts
deleted file mode 100644
index ac46760f..00000000
--- a/client/src/state/zustand/useThesisApplicationStore.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { create } from 'zustand'
-import { ThesisAdvisor, ThesisApplication } from '../../interface/thesisApplication'
-
-interface ThesisApplicationStoreState {
-  thesisApplications: ThesisApplication[]
-  thesisAdvisors: ThesisAdvisor[]
-}
-
-interface ThesisApplicationStoreAction {
-  setThesisApplications: (thesisApplications: ThesisApplication[]) => void
-  setThesisAdvisors: (thesisAdvisors: ThesisAdvisor[]) => void
-}
-
-export const useThesisApplicationStore = create<
-  ThesisApplicationStoreState & ThesisApplicationStoreAction
->((set) => ({
-  thesisApplications: [],
-  thesisAdvisors: [],
-  setThesisApplications: (thesisApplications) => set({ thesisApplications: thesisApplications }),
-  setThesisAdvisors: (thesisAdvisors) => set({ thesisAdvisors: thesisAdvisors }),
-}))
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index c86197a3..979f44c6 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -43,7 +43,6 @@ services:
       db:
         condition: service_healthy
     volumes:
-      - ./thesis_uploads:/thesis_application_uploads
       - ./mailing_templates:/mailing_templates
     expose:
       - "8080"
diff --git a/server/build.gradle b/server/build.gradle
index 55902a7b..8b4ed466 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 	implementation 'com.github.fge:json-patch:1.7'
 	implementation 'com.konghq:unirest-java:3.14.2'
 	implementation 'com.konghq:unirest-objectmapper-jackson:3.14.2'
-	implementation 'org.eclipse.jgit:org.eclipse.jgit:3.0.3.201309161630-r'
+	implementation 'org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r'
 	implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
 	// Liquibase
diff --git a/server/src/main/java/prompt/ls1/controller/MailingController.java b/server/src/main/java/prompt/ls1/controller/MailingController.java
index df49a49e..66385268 100644
--- a/server/src/main/java/prompt/ls1/controller/MailingController.java
+++ b/server/src/main/java/prompt/ls1/controller/MailingController.java
@@ -22,13 +22,13 @@ public MailingController(final MailingService mailingService) {
     }
 
     @GetMapping("/templates/{filename}")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
+    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin') || hasRole('ipraktikum-pm')")
     public ResponseEntity<String> getMailTemplate(@PathVariable final String filename) {
         return ResponseEntity.ok(mailingService.getMailTemplate(filename));
     }
 
     @PostMapping("/templates/{filename}")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
+    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin') || hasRole('ipraktikum-pm')")
     public ResponseEntity<String> updateMailTemplate(@PathVariable final String filename,
                                                      @RequestBody final String template) {
         mailingService.updateMailTemplate(filename, template);
diff --git a/server/src/main/java/prompt/ls1/controller/ThesisApplicationController.java b/server/src/main/java/prompt/ls1/controller/ThesisApplicationController.java
deleted file mode 100644
index 667efd34..00000000
--- a/server/src/main/java/prompt/ls1/controller/ThesisApplicationController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package prompt.ls1.controller;
-
-import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket;
-import io.github.bucket4j.Refill;
-import jakarta.mail.MessagingException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import prompt.ls1.controller.payload.ThesisApplicationAssessment;
-import prompt.ls1.model.ThesisAdvisor;
-import prompt.ls1.model.ThesisApplication;
-import prompt.ls1.service.MailingService;
-import prompt.ls1.service.ThesisApplicationService;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.List;
-import java.util.UUID;
-
-@Slf4j
-@RestController
-@RequestMapping("/thesis-applications")
-public class ThesisApplicationController {
-    private final Bucket bucket;
-    private final ThesisApplicationService thesisApplicationService;
-    private final MailingService mailingService;
-
-    @Autowired
-    public ThesisApplicationController(final ThesisApplicationService thesisApplicationService,
-                                       final MailingService mailingService) {
-        Bandwidth limit = Bandwidth.classic(100, Refill.greedy(100, Duration.ofMinutes(1)));
-        this.bucket = Bucket.builder()
-                .addLimit(limit)
-                .build();
-        this.thesisApplicationService = thesisApplicationService;
-        this.mailingService = mailingService;
-    }
-
-    @GetMapping
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<List<ThesisApplication>> getAll() {
-        return ResponseEntity.ok(thesisApplicationService.getAll());
-    }
-
-    @GetMapping("/not-assessed")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<List<ThesisApplication>> getAllNotAssessed() {
-        return ResponseEntity.ok(thesisApplicationService.getAllNotAssessed());
-    }
-
-    @GetMapping("/{thesisApplicationId}/examination-report")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<Resource> getExaminationReport(@PathVariable final UUID thesisApplicationId) {
-        return ResponseEntity.ok()
-                .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=examination_report_%s.pdf", thesisApplicationId))
-                .body(thesisApplicationService.getExaminationReport(thesisApplicationId));
-    }
-
-    @GetMapping("/{thesisApplicationId}/cv")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<Resource> getCV(@PathVariable final UUID thesisApplicationId) {
-        return ResponseEntity.ok()
-                .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=cv_%s.pdf", thesisApplicationId))
-                .body(thesisApplicationService.getCV(thesisApplicationId));
-    }
-
-    @GetMapping("/{thesisApplicationId}/bachelor-report")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<Resource> getBachelorReport(@PathVariable final UUID thesisApplicationId) {
-        return ResponseEntity.ok()
-                .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=bachelor_report_%s.pdf", thesisApplicationId))
-                .body(thesisApplicationService.getBachelorReport(thesisApplicationId));
-    }
-
-    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<ThesisApplication> create(@RequestPart("thesisApplication") final ThesisApplication thesisApplication,
-                                                    @RequestPart(value = "examinationReport") final MultipartFile examinationReport,
-                                                    @RequestPart(value = "cv") final MultipartFile cv,
-                                                    @RequestPart(value = "bachelorReport", required = false) final MultipartFile bachelorReport) throws MessagingException, IOException {
-        if (bucket.tryConsume(1)) {
-            final ThesisApplication application = thesisApplicationService
-                    .create(thesisApplication, examinationReport, cv, bachelorReport);
-            mailingService.thesisApplicationCreatedEmail(application.getStudent(), application);
-            mailingService.sendThesisApplicationConfirmationEmail(application.getStudent(), application);
-            return ResponseEntity.ok(application);
-        }
-
-        log.error("Post request on /thesis-applications was rejected due to exceeded request velocity.");
-        return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).build();
-    }
-
-    @PostMapping("/{thesisApplicationId}/assessment")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<ThesisApplication> assess(@PathVariable final UUID thesisApplicationId,
-                                           @RequestBody final ThesisApplicationAssessment assessment) {
-        return ResponseEntity.ok(thesisApplicationService.assess(thesisApplicationId, assessment.getStatus(), assessment.getAssessmentComment()));
-    }
-
-    @GetMapping("/thesis-advisors")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<List<ThesisAdvisor>> getAllThesisAdvisors() {
-        return ResponseEntity.ok(thesisApplicationService.getAllThesisAdvisors());
-    }
-
-    @PutMapping("/thesis-advisors")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<List<ThesisAdvisor>> updateThesisAdvisorList(@RequestBody final ThesisAdvisor thesisAdvisor) {
-        return ResponseEntity.ok(thesisApplicationService.updateThesisAdvisorList(thesisAdvisor));
-    }
-
-    @PostMapping("/{thesisApplicationId}/thesis-advisor/{thesisAdvisorId}")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<ThesisApplication> assignThesisAdvisor(@PathVariable final UUID thesisApplicationId,
-                                                                  @PathVariable final UUID thesisAdvisorId) {
-        return ResponseEntity.ok(thesisApplicationService.assignThesisAdvisor(thesisApplicationId, thesisAdvisorId));
-    }
-
-    @PostMapping("/{thesisApplicationId}/accept")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<ThesisApplication> acceptThesisApplication(
-            @PathVariable final UUID thesisApplicationId,
-            @RequestParam(required = false, defaultValue = "true") final boolean notifyStudent) {
-        return ResponseEntity.ok(thesisApplicationService.accept(thesisApplicationId, notifyStudent));
-    }
-
-    @PostMapping("/{thesisApplicationId}/reject")
-    @PreAuthorize("hasRole('chair-member') || hasRole('prompt-admin')")
-    public ResponseEntity<ThesisApplication> rejectThesisApplication(
-            @PathVariable final UUID thesisApplicationId,
-            @RequestParam(required = false, defaultValue = "true") final boolean notifyStudent) {
-        return ResponseEntity.ok(thesisApplicationService.reject(thesisApplicationId, notifyStudent));
-    }
-}
diff --git a/server/src/main/java/prompt/ls1/controller/payload/ThesisApplicationAssessment.java b/server/src/main/java/prompt/ls1/controller/payload/ThesisApplicationAssessment.java
deleted file mode 100644
index 87c2a768..00000000
--- a/server/src/main/java/prompt/ls1/controller/payload/ThesisApplicationAssessment.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package prompt.ls1.controller.payload;
-
-import lombok.Getter;
-import lombok.Setter;
-import prompt.ls1.model.enums.ApplicationStatus;
-
-@Getter
-@Setter
-public class ThesisApplicationAssessment {
-    private ApplicationStatus status;
-    private String assessmentComment;
-}
diff --git a/server/src/main/java/prompt/ls1/model/ThesisAdvisor.java b/server/src/main/java/prompt/ls1/model/ThesisAdvisor.java
deleted file mode 100644
index 4c6c6682..00000000
--- a/server/src/main/java/prompt/ls1/model/ThesisAdvisor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package prompt.ls1.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.persistence.UniqueConstraint;
-import jakarta.validation.constraints.Email;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.UUID;
-
-@Data
-@Entity
-@Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "email" }),
-        @UniqueConstraint(columnNames = { "tumId" }) })
-public class ThesisAdvisor {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
-    private String firstName;
-
-    private String lastName;
-
-    @Column(length = 50)
-    @Length(max = 50)
-    private String tumId;
-    @Email
-    @Column(unique = true)
-    private String email;
-}
diff --git a/server/src/main/java/prompt/ls1/model/ThesisApplication.java b/server/src/main/java/prompt/ls1/model/ThesisApplication.java
deleted file mode 100644
index f86857ef..00000000
--- a/server/src/main/java/prompt/ls1/model/ThesisApplication.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package prompt.ls1.model;
-
-import jakarta.persistence.*;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import lombok.Data;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-import prompt.ls1.model.enums.ApplicationStatus;
-import prompt.ls1.model.enums.Course;
-import prompt.ls1.model.enums.FocusTopic;
-import prompt.ls1.model.enums.ResearchArea;
-import prompt.ls1.model.enums.StudyDegree;
-import prompt.ls1.model.enums.StudyProgram;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.Set;
-import java.util.UUID;
-
-@Data
-@Entity
-@Table
-@org.hibernate.annotations.NamedQueries({
-        @org.hibernate.annotations.NamedQuery(
-                name = "ThesisApplication.findAllNotAssessed",
-                query = "SELECT ta FROM ThesisApplication ta " +
-                        "WHERE ta.applicationStatus = prompt.ls1.model.enums.ApplicationStatus.NOT_ASSESSED"
-        )
-})
-public class ThesisApplication implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
-    @CreationTimestamp
-    private LocalDateTime createdAt;
-
-    @UpdateTimestamp
-    private LocalDateTime updatedAt;
-
-    @ManyToOne
-    @JoinColumn(name = "student_id", referencedColumnName = "id")
-    private Student student;
-
-    @Min(1)
-    @Max(99)
-    private Short currentSemester;
-
-    @Enumerated(EnumType.STRING)
-    private StudyDegree studyDegree;
-
-    @Enumerated(EnumType.STRING)
-    private StudyProgram studyProgram;
-
-    @Column(columnDefinition = "DATE")
-    private Date desiredThesisStart;
-
-    private String thesisTitle;
-
-    @Column(length = 1000)
-    private String interests;
-
-    @Column(length = 1000)
-    private String projects;
-
-    @Column(length = 1000)
-    private String specialSkills;
-
-    @Column(length = 500)
-    private String motivation;
-
-    @Enumerated(EnumType.STRING)
-    private Set<Course> coursesTaken;
-
-    @Enumerated(EnumType.STRING)
-    private Set<ResearchArea> researchAreas;
-
-    @Enumerated(EnumType.STRING)
-    private Set<FocusTopic> focusTopics;
-
-    @Enumerated(EnumType.STRING)
-    private ApplicationStatus applicationStatus;
-
-    @Column(length = 2000)
-    private String assessmentComment;
-
-    private String examinationReportFilename;
-
-    private String cvFilename;
-
-    private String bachelorReportFilename;
-
-    @ManyToOne
-    @JoinColumn(name = "thesis_advisor_id")
-    private ThesisAdvisor thesisAdvisor;
-}
diff --git a/server/src/main/java/prompt/ls1/model/enums/ResearchArea.java b/server/src/main/java/prompt/ls1/model/enums/ResearchArea.java
deleted file mode 100644
index 141a6c77..00000000
--- a/server/src/main/java/prompt/ls1/model/enums/ResearchArea.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package prompt.ls1.model.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum ResearchArea {
-    EDUCATION_TECHNOLOGIES("Education Technologies"),
-    HUMAN_COMPUTER_INTERACTION("Human Computer Interaction"),
-    ROBOTIC("Robotic"),
-    SOFTWARE_ENGINEERING("Software Engineering");
-
-    private String value;
-}
diff --git a/server/src/main/java/prompt/ls1/repository/ThesisAdvisorRepository.java b/server/src/main/java/prompt/ls1/repository/ThesisAdvisorRepository.java
deleted file mode 100644
index d9032e3a..00000000
--- a/server/src/main/java/prompt/ls1/repository/ThesisAdvisorRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package prompt.ls1.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import prompt.ls1.model.ThesisAdvisor;
-
-import java.util.Optional;
-import java.util.UUID;
-
-@Repository
-public interface ThesisAdvisorRepository extends JpaRepository<ThesisAdvisor, UUID> {
-    Optional<ThesisAdvisor> findByTumId(final String tumId);
-}
diff --git a/server/src/main/java/prompt/ls1/repository/ThesisApplicationRepository.java b/server/src/main/java/prompt/ls1/repository/ThesisApplicationRepository.java
deleted file mode 100644
index 6a7e1ac2..00000000
--- a/server/src/main/java/prompt/ls1/repository/ThesisApplicationRepository.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package prompt.ls1.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import prompt.ls1.model.ThesisApplication;
-
-import java.util.List;
-import java.util.UUID;
-
-@Repository
-public interface ThesisApplicationRepository extends JpaRepository<ThesisApplication, UUID> {
-    @Transactional
-    List<ThesisApplication> findAllNotAssessed();
-}
diff --git a/server/src/main/java/prompt/ls1/service/MailingService.java b/server/src/main/java/prompt/ls1/service/MailingService.java
index b5eb5d1e..d189886a 100644
--- a/server/src/main/java/prompt/ls1/service/MailingService.java
+++ b/server/src/main/java/prompt/ls1/service/MailingService.java
@@ -14,11 +14,7 @@
 import prompt.ls1.model.CourseIteration;
 import prompt.ls1.model.DeveloperApplication;
 import prompt.ls1.model.Student;
-import prompt.ls1.model.ThesisAdvisor;
-import prompt.ls1.model.ThesisApplication;
 import prompt.ls1.model.TutorApplication;
-import prompt.ls1.model.enums.FocusTopic;
-import prompt.ls1.model.enums.ResearchArea;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,88 +57,6 @@ public void updateMailTemplate(final String filename, final String htmlContents)
         storageService.writeToFile(rootLocation, filename + ".html", htmlContents);
     }
 
-    public void thesisApplicationCreatedEmail(final Student student,
-                                              final ThesisApplication thesisApplication) throws MessagingException, IOException {
-        MimeMessage message = javaMailSender.createMimeMessage();
-
-        message.setFrom(sender);
-        Arrays.asList(chairMemberRecipientsList.split(";")).forEach(recipient -> {
-            try {
-                message.addRecipients(MimeMessage.RecipientType.TO, recipient);
-            } catch (MessagingException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        message.setSubject("PROMPT | New Thesis Application");
-
-        String template = storageService.readFromFile(rootLocation, "thesis-application-created.html");
-        template = fillStudentPlaceholders(template, student);
-        template = fillThesisApplicationPlaceholders(template, thesisApplication);
-
-        Multipart multipart = new MimeMultipart();
-
-        BodyPart messageBodyPart = new MimeBodyPart();
-        messageBodyPart.setContent(template, "text/html; charset=utf-8");
-        multipart.addBodyPart(messageBodyPart);
-
-        MimeBodyPart examinationReportAttachment = new MimeBodyPart();
-        examinationReportAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getExaminationReportFilename()));
-        multipart.addBodyPart(examinationReportAttachment);
-
-        MimeBodyPart cvAttachment = new MimeBodyPart();
-        cvAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getCvFilename()));
-        multipart.addBodyPart(cvAttachment);
-
-        if (thesisApplication.getBachelorReportFilename() != null && !thesisApplication.getBachelorReportFilename().isBlank()) {
-            MimeBodyPart bachelorReportAttachment = new MimeBodyPart();
-            bachelorReportAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getBachelorReportFilename()));
-            multipart.addBodyPart(bachelorReportAttachment);
-        }
-
-        message.setContent(multipart);
-
-        javaMailSender.send(message);
-    }
-
-    public void sendThesisApplicationConfirmationEmail(final Student student,
-                                              final ThesisApplication thesisApplication) throws MessagingException, IOException {
-        MimeMessage message = javaMailSender.createMimeMessage();
-
-        message.setFrom(sender);
-        message.setRecipients(MimeMessage.RecipientType.TO, student.getEmail());
-
-        message.setSubject("PROMPT | Thesis Application Confirmation");
-
-        String template = storageService.readFromFile(rootLocation, "thesis-application-confirmation.html");
-        template = fillStudentPlaceholders(template, student);
-        template = fillThesisApplicationPlaceholders(template, thesisApplication);
-
-        Multipart multipart = new MimeMultipart();
-
-        BodyPart messageBodyPart = new MimeBodyPart();
-        messageBodyPart.setContent(template, "text/html; charset=utf-8");
-        multipart.addBodyPart(messageBodyPart);
-
-        MimeBodyPart examinationReportAttachment = new MimeBodyPart();
-        examinationReportAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getExaminationReportFilename()));
-        multipart.addBodyPart(examinationReportAttachment);
-
-        MimeBodyPart cvAttachment = new MimeBodyPart();
-        cvAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getCvFilename()));
-        multipart.addBodyPart(cvAttachment);
-
-        if (thesisApplication.getBachelorReportFilename() != null && !thesisApplication.getBachelorReportFilename().isBlank()) {
-            MimeBodyPart bachelorReportAttachment = new MimeBodyPart();
-            bachelorReportAttachment.attachFile(new File("thesis_application_uploads/" + thesisApplication.getBachelorReportFilename()));
-            multipart.addBodyPart(bachelorReportAttachment);
-        }
-
-        message.setContent(multipart);
-
-        javaMailSender.send(message);
-    }
-
     public void sendDeveloperApplicationConfirmationEmail(final Student student,
                                                           final DeveloperApplication developerApplication,
                                                           final CourseIteration courseIteration) throws MessagingException {
@@ -352,55 +266,6 @@ public void sendTechnicalDetailsSubmissionInvitationEmail(final Student student,
         javaMailSender.send(message);
     }
 
-    public void sendThesisAcceptanceEmail(final Student student,
-                                          final ThesisApplication thesisApplication,
-                                          final ThesisAdvisor thesisAdvisor) throws MessagingException {
-        MimeMessage message = javaMailSender.createMimeMessage();
-
-        message.setFrom(sender);
-        message.setRecipients(MimeMessage.RecipientType.TO, student.getEmail());
-        if (environment.equals("prod")) {
-            message.addRecipients(MimeMessage.RecipientType.CC, "krusche@tum.de");
-        }
-        message.addRecipients(MimeMessage.RecipientType.BCC, "valeryia.andraichuk@tum.de");
-        message.setSubject("Thesis Application Acceptance");
-
-        String template;
-        if (!thesisAdvisor.getEmail().equals("krusche@tum.de")) {
-            message.addRecipients(MimeMessage.RecipientType.CC, thesisAdvisor.getEmail());
-
-            template = storageService.readFromFile(rootLocation, "thesis-application-acceptance.html");
-            template = fillThesisAdvisorPlaceholders(template, thesisAdvisor);
-        } else {
-            template = storageService.readFromFile(rootLocation, "thesis-application-acceptance-no-advisor.html");
-        }
-        template = fillStudentPlaceholders(template, student);
-        template = fillThesisApplicationPlaceholders(template, thesisApplication);
-        message.setContent(template, "text/html; charset=utf-8");
-
-        javaMailSender.send(message);
-    }
-
-    public void sendThesisRejectionEmail(final Student student, final ThesisApplication thesisApplication) throws MessagingException {
-        MimeMessage message = javaMailSender.createMimeMessage();
-
-        message.setFrom(sender);
-        message.setRecipients(MimeMessage.RecipientType.TO, student.getEmail());
-        if (environment.equals("prod")) {
-            message.addRecipients(MimeMessage.RecipientType.BCC, "krusche@tum.de");
-        }
-        message.addRecipients(MimeMessage.RecipientType.BCC, "valeryia.andraichuk@tum.de");
-        message.setSubject("Thesis Application Rejection");
-
-        String template = storageService.readFromFile(rootLocation, "thesis-application-rejection.html");
-        template = fillStudentPlaceholders(template, student);
-        template = fillThesisApplicationPlaceholders(template, thesisApplication);
-
-        message.setContent(template, "text/html; charset=utf-8");
-
-        javaMailSender.send(message);
-    }
-
     public String fillCourseIterationPlaceholders(final String template, final CourseIteration courseIteration) {
         String pattern = "dd. MMM yyyy";
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
@@ -474,29 +339,4 @@ private String fillStudentPlaceholders(final String template, final Student stud
                 .replace("{{student.nationality}}", student.getNationality())
                 .replace("{{student.isExchangeStudent}}", student.getIsExchangeStudent().toString());
     }
-
-    private String fillThesisApplicationPlaceholders(final String template, final ThesisApplication thesisApplication) {
-        String pattern = "dd. MMM yyyy";
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
-
-        return template.replace("{{application.studyProgram}}", thesisApplication.getStudyProgram().getValue())
-                .replace("{{application.studyDegree}}", thesisApplication.getStudyDegree().getValue())
-                .replace("{{application.currentSemester}}", thesisApplication.getCurrentSemester().toString())
-                .replace("{{application.desiredThesisStart}}", simpleDateFormat.format(thesisApplication.getDesiredThesisStart()))
-                .replace("{{application.specialSkills}}", thesisApplication.getSpecialSkills())
-                .replace("{{application.motivation}}", thesisApplication.getMotivation())
-                .replace("{{application.interests}}", thesisApplication.getInterests())
-                .replace("{{application.projects}}", thesisApplication.getProjects())
-                .replace("{{application.specialSkills}}", thesisApplication.getSpecialSkills())
-                .replace("{{application.thesisTitle}}", thesisApplication.getThesisTitle())
-                .replace("{{application.researchAreas}}", String.join(", ", thesisApplication.getResearchAreas().stream().map(ResearchArea::getValue).toList()))
-                .replace("{{application.focusTopics}}", String.join(", ", thesisApplication.getFocusTopics().stream().map(FocusTopic::getValue).toList()));
-    }
-
-    private String fillThesisAdvisorPlaceholders(final String template, final ThesisAdvisor thesisAdvisor) {
-        return template.replace("{{advisor.firstName}}", thesisAdvisor.getFirstName())
-                .replace("{{advisor.lastName}}", thesisAdvisor.getLastName())
-                .replace("{{advisor.email}}", thesisAdvisor.getEmail())
-                .replace("{{advisor.tumId}}", thesisAdvisor.getTumId());
-    }
 }
diff --git a/server/src/main/java/prompt/ls1/service/ThesisApplicationService.java b/server/src/main/java/prompt/ls1/service/ThesisApplicationService.java
deleted file mode 100644
index 0539ed09..00000000
--- a/server/src/main/java/prompt/ls1/service/ThesisApplicationService.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package prompt.ls1.service;
-
-import jakarta.mail.MessagingException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import prompt.ls1.exception.FailedMailSend;
-import prompt.ls1.exception.ResourceInvalidParametersException;
-import prompt.ls1.model.Student;
-import prompt.ls1.model.ThesisAdvisor;
-import prompt.ls1.model.ThesisApplication;
-import prompt.ls1.model.enums.ApplicationStatus;
-import prompt.ls1.repository.StudentRepository;
-import prompt.ls1.repository.ThesisAdvisorRepository;
-import prompt.ls1.repository.ThesisApplicationRepository;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-@Service
-public class ThesisApplicationService {
-    private final ThesisApplicationRepository thesisApplicationRepository;
-    private final StudentRepository studentRepository;
-    private final ThesisAdvisorRepository thesisAdvisorRepository;
-    private final FileSystemStorageService storageService;
-    private final MailingService mailingService;
-    private final Path rootLocation;
-
-    @Autowired
-    public ThesisApplicationService(final ThesisApplicationRepository thesisApplicationRepository,
-                                    final StudentRepository studentRepository,
-                                    final ThesisAdvisorRepository thesisAdvisorRepository,
-                                    final FileSystemStorageService storageService,
-                                    final MailingService mailingService,
-                                    @Value("${prompt.storage.theses-application-uploads-location}") String thesesApplicationsUploadsLocation) {
-        this.thesisApplicationRepository = thesisApplicationRepository;
-        this.studentRepository = studentRepository;
-        this.thesisAdvisorRepository = thesisAdvisorRepository;
-        this.storageService = storageService;
-        this.mailingService = mailingService;
-        this.rootLocation = Paths.get(thesesApplicationsUploadsLocation);
-    }
-
-    public List<ThesisApplication> getAll() {
-        return thesisApplicationRepository.findAll();
-    }
-
-    public List<ThesisApplication> getAllNotAssessed() {
-        return thesisApplicationRepository.findAllNotAssessed();
-    }
-
-    public Resource getExaminationReport(final UUID thesisApplicationId) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        return storageService.load(rootLocation, thesisApplication.getExaminationReportFilename());
-    }
-
-    public Resource getCV(final UUID thesisApplicationId) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        return storageService.load(rootLocation, thesisApplication.getCvFilename());
-    }
-
-    public Resource getBachelorReport(final UUID thesisApplicationId) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        return storageService.load(rootLocation, thesisApplication.getBachelorReportFilename());
-    }
-
-    public ThesisApplication create(final ThesisApplication thesisApplication,
-                                    final MultipartFile transcriptOfRecords,
-                                    final MultipartFile cv,
-                                    final MultipartFile bachelorReport) {
-        final Student student = thesisApplication.getStudent();
-        if (student == null ||
-                (student.getTumId() == null && student.getMatriculationNumber() == null && student.getEmail() == null)) {
-            throw new IllegalArgumentException(
-                    "Student identification information must be provided: tum ID, matriculation number or email address.");
-        }
-        Optional<Student> existingStudent = findStudent(student.getTumId(), student.getMatriculationNumber(), student.getEmail());
-
-        if (existingStudent.isEmpty()) {
-            studentRepository.save(student);
-        } else {
-            thesisApplication.setStudent(checkAndUpdateStudent(existingStudent.get(), thesisApplication.getStudent()));
-        }
-
-        final String examinationReportFilename = storageService.store(rootLocation, transcriptOfRecords);
-        thesisApplication.setExaminationReportFilename(examinationReportFilename);
-        final String cvFilename = storageService.store(rootLocation, cv);
-        thesisApplication.setCvFilename(cvFilename);
-        if (bachelorReport != null && !bachelorReport.isEmpty()) {
-            final String bachelorReportFilename = storageService.store(rootLocation, bachelorReport);
-            thesisApplication.setBachelorReportFilename(bachelorReportFilename);
-        }
-
-        thesisApplication.setApplicationStatus(ApplicationStatus.NOT_ASSESSED);
-        return thesisApplicationRepository.save(thesisApplication);
-    }
-
-    public ThesisApplication assess(final UUID thesisApplicationId,
-                                    final ApplicationStatus status,
-                                    final String assessmentComment) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        thesisApplication.setApplicationStatus(status);
-        thesisApplication.setAssessmentComment(assessmentComment);
-        return thesisApplicationRepository.save(thesisApplication);
-    }
-
-    public ThesisApplication assignThesisAdvisor(final UUID thesisApplicationId, final UUID thesisAdvisorId) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        final ThesisAdvisor thesisAdvisor = thesisAdvisorRepository.findById(thesisAdvisorId)
-                .orElseThrow(() -> new ResourceInvalidParametersException(
-                        String.format("Thesis advisor with id %s not found.", thesisAdvisorId)));
-        thesisApplication.setThesisAdvisor(thesisAdvisor);
-        return thesisApplicationRepository.save(thesisApplication);
-    }
-
-    public ThesisApplication accept(final UUID thesisApplicationId, final boolean notifyStudent) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        if (thesisApplication.getThesisAdvisor() == null) {
-            throw new ResourceInvalidParametersException("Thesis advisor must be assigned before accepting a thesis application.");
-        }
-
-        thesisApplication.setApplicationStatus(ApplicationStatus.ACCEPTED);
-
-        if (notifyStudent) {
-            try {
-                mailingService.sendThesisAcceptanceEmail(
-                        thesisApplication.getStudent(), thesisApplication, thesisApplication.getThesisAdvisor());
-            } catch (MessagingException e) {
-                throw new FailedMailSend("Failed to send thesis acceptance email.");
-            }
-        }
-
-        return thesisApplicationRepository.save(thesisApplication);
-    }
-
-    public ThesisApplication reject(final UUID thesisApplicationId, final boolean notifyStudent) {
-        final ThesisApplication thesisApplication = findById(thesisApplicationId);
-        thesisApplication.setApplicationStatus(ApplicationStatus.REJECTED);
-
-        if (notifyStudent) {
-            try {
-                mailingService.sendThesisRejectionEmail(thesisApplication.getStudent(), thesisApplication);
-            } catch (MessagingException e) {
-                throw new FailedMailSend("Failed to send thesis rejection email.");
-            }
-        }
-
-        return thesisApplicationRepository.save(thesisApplication);
-    }
-
-    public List<ThesisAdvisor> getAllThesisAdvisors() {
-        return thesisAdvisorRepository.findAll();
-    }
-
-    public List<ThesisAdvisor> updateThesisAdvisorList(final ThesisAdvisor thesisAdvisor) {
-        if (thesisAdvisor.getTumId() != null && !thesisAdvisor.getTumId().isBlank()) {
-            if (thesisAdvisorRepository.findByTumId(thesisAdvisor.getTumId()).isEmpty()) {
-                thesisAdvisorRepository.save(thesisAdvisor);
-            }
-        }
-
-        return thesisAdvisorRepository.findAll();
-    }
-
-    private ThesisApplication findById(final UUID thesisApplicationId) {
-        return thesisApplicationRepository.findById(thesisApplicationId)
-                .orElseThrow(() -> new ResourceInvalidParametersException(
-                        String.format("Thesis application with id %s not found.", thesisApplicationId)));
-    }
-
-    private Optional<Student> findStudent(final String tumId, final String matriculationNumber, final String email) {
-        if ((tumId != null && !tumId.isBlank()) || (matriculationNumber != null && !matriculationNumber.isBlank())) {
-            return studentRepository.findByTumIdOrMatriculationNumber(tumId, matriculationNumber);
-        }
-        return studentRepository.findByEmail(email);
-    }
-
-    private Student checkAndUpdateStudent(final Student existingStudent, final Student updatedStudent) {
-        if (((existingStudent.getTumId() != null && !existingStudent.getTumId().isBlank()) && !existingStudent.getTumId().equals(updatedStudent.getTumId())) ||
-                (existingStudent.getMatriculationNumber() != null && !existingStudent.getMatriculationNumber().isBlank()) && !existingStudent.getMatriculationNumber().equals(updatedStudent.getMatriculationNumber())) {
-            throw new ResourceInvalidParametersException("Provided TUM ID does not match with the matriculation number you submitted. " +
-                    "If You are sure the data is entered correct, please contact the Program Management.");
-        }
-        existingStudent.setGender(updatedStudent.getGender());
-        existingStudent.setFirstName(updatedStudent.getFirstName());
-        existingStudent.setLastName(updatedStudent.getLastName());
-        existingStudent.setEmail(updatedStudent.getEmail());
-
-        return studentRepository.save(existingStudent);
-    }
-}
diff --git a/server/src/main/resources/db/changelog/changes/v0022.sql b/server/src/main/resources/db/changelog/changes/v0022.sql
new file mode 100644
index 00000000..6f133d1a
--- /dev/null
+++ b/server/src/main/resources/db/changelog/changes/v0022.sql
@@ -0,0 +1,18 @@
+--liquibase formatted sql
+
+--changeset author:niclasheun
+
+-- Drop CAST from focus_topic
+DROP CAST IF EXISTS (varchar AS focus_topic);
+
+-- Drop focus_topic ENUM
+DROP TYPE IF EXISTS focus_topic CASCADE;
+
+DROP CAST IF EXISTS (varchar AS research_area);
+DROP TYPE IF EXISTS research_area CASCADE;
+
+-- Drop thesis_application table
+DROP TABLE IF EXISTS thesis_application CASCADE;
+
+-- Drop the thesis_advisor table (if necessary)
+DROP TABLE IF EXISTS thesis_advisor CASCADE;
\ No newline at end of file
diff --git a/server/src/main/resources/db/changelog/db.changelog-master.xml b/server/src/main/resources/db/changelog/db.changelog-master.xml
index 242e0e8e..35ea6e14 100644
--- a/server/src/main/resources/db/changelog/db.changelog-master.xml
+++ b/server/src/main/resources/db/changelog/db.changelog-master.xml
@@ -23,4 +23,5 @@
     <include file="changes/v0019.sql" relativeToChangelogFile="true"/>
     <include file="changes/v0020.sql" relativeToChangelogFile="true"/>
     <include file="changes/v0021.sql" relativeToChangelogFile="true"/>
+    <include file="changes/v0022.sql" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file