diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/UnitAddress.vue b/strr-host-pm-web/app/components/form/DefineYourRental/UnitAddress.vue
index 2049400e9..0ee8ba33f 100644
--- a/strr-host-pm-web/app/components/form/DefineYourRental/UnitAddress.vue
+++ b/strr-host-pm-web/app/components/form/DefineYourRental/UnitAddress.vue
@@ -10,7 +10,6 @@ const props = defineProps<{ isComplete: boolean }>()
 
 const unitAddressFormRef = ref<Form<any>>()
 const unitPidFormRef = ref<Form<any>>()
-const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 
 // clear form errors and submit when new address selected form autocomplete
 function handleNewAddress () {
@@ -54,6 +53,7 @@ onMounted(async () => {
   // validate form if step marked as complete
   if (props.isComplete) {
     await validateForm(unitAddressFormRef.value, props.isComplete)
+    await validateForm(unitPidFormRef.value, props.isComplete)
   }
 
   // trigger address requirements check when Registration Renewal is loaded
@@ -268,7 +268,7 @@ onMounted(async () => {
     </UForm>
 
     <UForm
-      v-if="isNewRentalUnitSetupEnabled && hasPropertyRequirements && reqStore.showUnitDetailsForm"
+      v-if="hasPropertyRequirements && reqStore.showUnitDetailsForm"
       ref="unitPidFormRef"
       data-testid="form-unit-pid"
       :schema="propStore.getUnitDetailsSchema()"
@@ -286,12 +286,8 @@ onMounted(async () => {
           class="[&_.max-w-bcGovInput]:max-w-full"
           mask="###-###-###"
           name="parcelIdentifier"
-          :aria-label="(!propStore.unitDetails.ownershipType || propStore.isOwnerOrCoOwner)
-            ? $t('strr.label.parcelIdentifier')
-            : $t('strr.label.parcelIdentifierOpt')"
-          :placeholder="(!propStore.unitDetails.ownershipType || propStore.isOwnerOrCoOwner)
-            ? $t('strr.label.parcelIdentifier')
-            : $t('strr.label.parcelIdentifierOpt')"
+          :aria-label="$t('strr.label.parcelIdentifier')"
+          :placeholder="$t('strr.label.parcelIdentifier')"
         >
           <template #help>
             <span>
diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails.vue b/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails.vue
index 9abd7ae50..c8424d504 100644
--- a/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails.vue
+++ b/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails.vue
@@ -9,62 +9,84 @@ const { getUnitDetailsSchema } = useHostPropertyStore()
 
 const unitDetailsFormRef = ref<Form<any>>()
 
+const isStrataHotelExemption = computed((): boolean =>
+  reqStore.prRequirements.prExemptionReason === PrExemptionReason.STRATA_HOTEL)
+
+const isPrRequired = computed((): boolean =>
+  reqStore.propertyReqs.isPrincipalResidenceRequired)
+
+const isPrExempt = computed((): boolean =>
+  reqStore.prRequirements.isPropertyPrExempt)
+
+const isHostTypeTenant = computed((): boolean =>
+  propStore.unitDetails.hostType === PropertyHostType.LONG_TERM_TENANT)
+
 const propertyTypes = [
   { name: t(`propertyType.${PropertyType.SINGLE_FAMILY_HOME}`), value: PropertyType.SINGLE_FAMILY_HOME },
   { name: t(`propertyType.${PropertyType.SECONDARY_SUITE}`), value: PropertyType.SECONDARY_SUITE },
   { name: t(`propertyType.${PropertyType.ACCESSORY_DWELLING}`), value: PropertyType.ACCESSORY_DWELLING },
-  { name: t(`propertyType.${PropertyType.TOWN_HOME}`), value: PropertyType.TOWN_HOME },
   { name: t(`propertyType.${PropertyType.MULTI_UNIT_HOUSING}`), value: PropertyType.MULTI_UNIT_HOUSING },
-  { name: t(`propertyType.${PropertyType.CONDO_OR_APT}`), value: PropertyType.CONDO_OR_APT },
-  { name: t(`propertyType.${PropertyType.RECREATIONAL}`), value: PropertyType.RECREATIONAL },
   { name: t(`propertyType.${PropertyType.BED_AND_BREAKFAST}`), value: PropertyType.BED_AND_BREAKFAST },
-  { name: t(`propertyType.${PropertyType.STRATA_HOTEL}`), value: PropertyType.STRATA_HOTEL },
   { name: t(`propertyType.${PropertyType.FLOAT_HOME}`), value: PropertyType.FLOAT_HOME }
 ]
-const rentalTypeOptions = [
-  { value: RentalUnitType.ENTIRE_HOME, label: t(`rentalUnitType.${RentalUnitType.ENTIRE_HOME}`) },
-  { value: RentalUnitType.SHARED_ACCOMMODATION, label: t(`rentalUnitType.${RentalUnitType.SHARED_ACCOMMODATION}`) }
+
+const strataHotelPropertyType = [
+  { name: t(`propertyType.${PropertyType.STRATA_HOTEL}`), value: PropertyType.STRATA_HOTEL }
 ]
-const ownershipTypes = [
-  { label: t(`ownershipType.${OwnershipType.OWN}`), value: OwnershipType.OWN },
-  { label: t(`ownershipType.${OwnershipType.CO_OWN}`), value: OwnershipType.CO_OWN },
-  { label: t(`ownershipType.${OwnershipType.RENT}`), value: OwnershipType.RENT },
-  { label: t(`ownershipType.${OwnershipType.OTHER}`), value: OwnershipType.OTHER }
+
+const propertyHostTypeOptions = [
+  { value: PropertyHostType.OWNER, label: t(`propertyHostType.${PropertyHostType.OWNER}`) },
+  { value: PropertyHostType.FRIEND_RELATIVE, label: t(`propertyHostType.${PropertyHostType.FRIEND_RELATIVE}`) },
+  { value: PropertyHostType.LONG_TERM_TENANT, label: t(`propertyHostType.${PropertyHostType.LONG_TERM_TENANT}`) }
 ]
 
-const rentalUnitSetupTypes = [
+const rentalUnitSetupOptions = computed(() => [
   {
-    label: t(`rentalUnitSetupType.${RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE}`),
-    value: RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE
+    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.DIFFERENT_PROPERTY}.label`),
+    value: RentalUnitSetupOption.DIFFERENT_PROPERTY,
+    disabled: (isPrRequired.value && !isPrExempt.value) || isHostTypeTenant.value
   },
   {
-    label: t(`rentalUnitSetupType.${RentalUnitSetupType.UNIT_ON_PR_PROPERTY}`),
-    value: RentalUnitSetupType.UNIT_ON_PR_PROPERTY
+    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY}.label`),
+    value: RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY,
+    disabled: isHostTypeTenant.value
   },
   {
-    label: t(`rentalUnitSetupType.${RentalUnitSetupType.UNIT_NOT_ON_PR_PROPERTY}`),
-    value: RentalUnitSetupType.UNIT_NOT_ON_PR_PROPERTY
+    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.PRIMARY_RESIDENCE_OR_SHARED_SPACE}.label`),
+    value: RentalUnitSetupOption.PRIMARY_RESIDENCE_OR_SHARED_SPACE
   }
-]
+])
+
+// watch and set Property Host Type as strata if PR Exemption reason is Strata Hotel
+watch(() => reqStore.prRequirements.prExemptionReason, async (val) => {
+  if (val === PrExemptionReason.STRATA_HOTEL) {
+    propStore.unitDetails.propertyType = PropertyType.STRATA_HOTEL
+    await validateForm(unitDetailsFormRef.value, props.isComplete) // validate the form to clear the unit type errors
+  }
+})
+
+// watch and clear unit setup radio if one of the disabled options selected
+watch(() => propStore.unitDetails.hostType, (val) => {
+  const isLongTermTenant = val === PropertyHostType.LONG_TERM_TENANT
+  const isDisabledOptionSelected =
+    [RentalUnitSetupOption.DIFFERENT_PROPERTY, RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY]
+      .includes(propStore.unitDetails.rentalUnitSetupOption as RentalUnitSetupOption)
 
-// revalidate parcelIdentifer when user changes ownsership types
-watch(
-  () => propStore.unitDetails.ownershipType,
-  (newVal) => {
-    if (newVal &&
-        [OwnershipType.OWN, OwnershipType.CO_OWN].includes(newVal) &&
-        propStore.unitDetails.parcelIdentifier !== ''
-    ) {
-      unitDetailsFormRef.value?.validate('parcelIdentifier', { silent: true })
-    }
-    if (newVal &&
-        [OwnershipType.RENT, OwnershipType.OTHER].includes(newVal) &&
-        propStore.unitDetails.parcelIdentifier === ''
-    ) {
-      unitDetailsFormRef.value?.validate('parcelIdentifier', { silent: true })
-    }
+  if (isLongTermTenant && isDisabledOptionSelected) {
+    propStore.unitDetails.rentalUnitSetupOption = undefined
   }
-)
+})
+
+// watch and clear unit setup radio option 1 if PR is not exempt
+watch(() => reqStore.prRequirements.isPropertyPrExempt, (val) => {
+  const isNotExempt = !val
+  const isDisabledOptionSelected = [RentalUnitSetupOption.DIFFERENT_PROPERTY]
+    .includes(propStore.unitDetails.rentalUnitSetupOption as RentalUnitSetupOption)
+
+  if (isNotExempt && isDisabledOptionSelected) {
+    propStore.unitDetails.rentalUnitSetupOption = undefined
+  }
+})
 
 onMounted(async () => {
   // validate form if step marked as complete
@@ -86,37 +108,40 @@ onMounted(async () => {
       <div class="space-y-10 py-10">
         <!-- property type section -->
         <ConnectFormSection
-          :title="$t('strr.label.propertyType')"
+          :title="$t('strr.label.strRentalType')"
           :error="isComplete && hasFormErrors(unitDetailsFormRef, ['propertyType'])"
         >
           <UFormGroup id="property-type" v-slot="{ error }" name="propertyType">
             <USelectMenu
               v-model="propStore.unitDetails.propertyType"
               value-attribute="value"
-              class="max-w-bcGovInput"
               size="lg"
               :color="propStore.unitDetails.propertyType ? 'primary' : 'gray'"
-              :placeholder="$t('strr.label.propertyType')"
-              :options="propertyTypes"
+              :placeholder="$t('strr.label.selectPropertyType')"
+              :options="isStrataHotelExemption ? strataHotelPropertyType : propertyTypes"
               option-attribute="name"
-              :aria-label="$t('strr.label.propertyType')"
+              :disabled="isStrataHotelExemption"
+              :aria-label="$t('strr.label.selectPropertyType')"
               :aria-required="true"
               :aria-invalid="error !== undefined"
+              :ui="{ base: 'disabled:opacity-50' }"
               :ui-menu="{
                 label: propStore.unitDetails.propertyType ? 'text-gray-900' : !!error? 'text-red-600': 'text-gray-700'
               }"
+              data-testid="property-type-select"
             />
           </UFormGroup>
 
           <UAlert
             v-if="propStore.isUnitNumberRequired"
-            class="mt-6 max-w-bcGovInput"
+            class="mt-6"
             color="yellow"
             icon="i-mdi-alert"
             :close-button="null"
             variant="subtle"
             :ui="{
               inner: 'pt-0',
+              padding: 'p-6',
               icon: {
                 base: 'flex-shrink-0 w-5 h-5 self-start'
               }
@@ -137,22 +162,20 @@ onMounted(async () => {
           </UAlert>
         </ConnectFormSection>
 
-        <!-- type of space section -->
+        <!-- Property Host Type -->
         <ConnectFormSection
-          :title="$t('label.typeOfSpace')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['typeOfSpace'])"
+          :title="$t('strr.label.hostType')"
+          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['hostType'])"
         >
-          <UFormGroup name="typeOfSpace">
+          <UFormGroup name="hostType">
             <URadioGroup
-              id="rental-type-radio-group"
-              v-model="propStore.unitDetails.typeOfSpace"
-              :legend="$t('text.typeOfSpaceLegend')"
-              :class="isComplete && hasFormErrors(unitDetailsFormRef, ['typeOfSpace'])
-                ? 'border-red-600 border-2 p-2'
-                : 'p-2'"
-              :options="rentalTypeOptions"
+              id="host-type-radio-group"
+              v-model="propStore.unitDetails.hostType"
+              :legend="$t('text.hostTypeLegend')"
+              :options="propertyHostTypeOptions"
               :ui="{ legend: 'sr-only' }"
               :ui-radio="{ inner: 'space-y-2' }"
+              data-testid="property-host-type"
             />
           </UFormGroup>
         </ConnectFormSection>
@@ -160,91 +183,39 @@ onMounted(async () => {
         <!-- rental unit setup section -->
         <ConnectFormSection
           :title="$t('strr.label.rentalUnitSetup')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['rentalUnitSetupType'])"
+          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['rentalUnitSetupOption'])"
         >
-          <UFormGroup id="rental-unit-setup" name="rentalUnitSetupType">
+          <UFormGroup
+            id="rental-unit-setup"
+            name="rentalUnitSetupOption"
+            class="w-full"
+          >
+            <ConnectI18nHelper
+              translation-path="strr.label.rentalUnitSetupNote"
+              class="mb-8 block border-y py-4 text-sm italic"
+            />
             <URadioGroup
               id="rental-unit-setup-radio-group"
-              v-model="propStore.unitDetails.rentalUnitSetupType"
-              :class="isComplete && hasFormErrors(unitDetailsFormRef, ['rentalUnitSetupType'])
-                ? 'border-red-600 border-2 p-2'
-                : 'p-2'"
-              :options="rentalUnitSetupTypes"
+              v-model="propStore.unitDetails.rentalUnitSetupOption"
+              class="max-w-full"
+              :options="rentalUnitSetupOptions"
               :legend="$t('text.rentalUnitSetupLegend')"
               :ui="{ legend: 'sr-only' }"
-              :ui-radio="{ inner: 'space-y-2' }"
-            />
-          </UFormGroup>
-        </ConnectFormSection>
-
-        <!-- number of rooms for rent section -->
-        <ConnectFormSection
-          :title="$t('strr.label.numberOfRooms')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['numberOfRoomsForRent'])"
-        >
-          <ConnectFormFieldGroup
-            id="property-rooms"
-            v-model="propStore.unitDetails.numberOfRoomsForRent"
-            :aria-label="$t('strr.label.numberOfRooms')"
-            name="numberOfRoomsForRent"
-            :placeholder="$t('strr.label.numberOfRooms')"
-            :is-required="true"
-            type="number"
-            :min="0"
-            :max="5000"
-          />
-        </ConnectFormSection>
-
-        <div class="h-px w-full border-b border-gray-100" />
-
-        <!-- ownership type section -->
-        <ConnectFormSection
-          :title="$t('strr.label.ownershipType')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['ownershipType'])"
-        >
-          <UFormGroup id="ownership-type" name="ownershipType">
-            <URadioGroup
-              id="ownership-type-radio-group"
-              v-model="propStore.unitDetails.ownershipType"
-              :class="isComplete && hasFormErrors(unitDetailsFormRef, ['ownershipType'])
-                ? 'border-red-600 border-2 p-2'
-                : 'p-2'"
-              :options="ownershipTypes"
-              :legend="$t('strr.text.ownershipTypeLegend')"
-              :ui="{ legend: 'sr-only' }"
-              :ui-radio="{ inner: 'space-y-2' }"
-            />
-          </UFormGroup>
-        </ConnectFormSection>
-
-        <!-- parcel identifier (PID) section -->
-        <ConnectFormSection
-          :title="$t('strr.label.parcelId')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['parcelIdentifier'])"
-        >
-          <ConnectFormFieldGroup
-            id="property-parcel-id"
-            v-model="propStore.unitDetails.parcelIdentifier"
-            mask="###-###-###"
-            name="parcelIdentifier"
-            :aria-label="(!propStore.unitDetails.ownershipType || propStore.isOwnerOrCoOwner)
-              ? $t('strr.label.parcelIdentifier')
-              : $t('strr.label.parcelIdentifierOpt')"
-            :placeholder="(!propStore.unitDetails.ownershipType || propStore.isOwnerOrCoOwner)
-              ? $t('strr.label.parcelIdentifier')
-              : $t('strr.label.parcelIdentifierOpt')"
-          >
-            <template #help>
-              <span>
-                {{ $t('strr.hint.parcelIdentifier') }}
-                <span class="inline-flex align-text-top">
-                  <ConnectTooltip :text="$t('tooltip.pid')" :popper="{ placement: 'right' }">
-                    <UIcon name="i-mdi-info-outline" class="ml-0.5 size-4 shrink-0 text-blue-500" />
-                  </ConnectTooltip>
+              :ui-radio="{ inner: 'space-y-2', label: 'font-bold' }"
+              data-testid="unit-setup-option"
+            >
+              <template #label="{ option }">
+                <span :class="{ 'opacity-50': option.disabled }">
+                  {{ option.label }}
                 </span>
-              </span>
-            </template>
-          </ConnectFormFieldGroup>
+              </template>
+              <template #help="{ option }">
+                <span :class="{ 'opacity-50': option.disabled }">
+                  <FormDefineYourRentalUnitSetupOptions :option="option" />
+                </span>
+              </template>
+            </URadioGroup>
+          </UFormGroup>
         </ConnectFormSection>
       </div>
     </ConnectPageSection>
diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails2.vue b/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails2.vue
deleted file mode 100644
index 591aef850..000000000
--- a/strr-host-pm-web/app/components/form/DefineYourRental/UnitDetails2.vue
+++ /dev/null
@@ -1,242 +0,0 @@
-<script setup lang="ts">
-import type { Form } from '#ui/types'
-const props = defineProps<{ isComplete: boolean }>()
-
-const { t } = useNuxtApp().$i18n
-const reqStore = usePropertyReqStore()
-const propStore = useHostPropertyStore()
-const { getUnitDetailsSchema2 } = useHostPropertyStore()
-
-const unitDetailsFormRef = ref<Form<any>>()
-
-const isStrataHotelExemption = computed((): boolean =>
-  reqStore.prRequirements.prExemptionReason === PrExemptionReason.STRATA_HOTEL)
-
-const isPrRequired = computed((): boolean =>
-  reqStore.propertyReqs.isPrincipalResidenceRequired)
-
-const isPrExempt = computed((): boolean =>
-  reqStore.prRequirements.isPropertyPrExempt)
-
-const isHostTypeTenant = computed((): boolean =>
-  propStore.unitDetails.hostType === PropertyHostType.LONG_TERM_TENANT)
-
-const propertyTypes = [
-  { name: t(`propertyType.${PropertyType.SINGLE_FAMILY_HOME}`), value: PropertyType.SINGLE_FAMILY_HOME },
-  { name: t(`propertyType.${PropertyType.SECONDARY_SUITE}`), value: PropertyType.SECONDARY_SUITE },
-  { name: t(`propertyType.${PropertyType.ACCESSORY_DWELLING}`), value: PropertyType.ACCESSORY_DWELLING },
-  { name: t(`propertyType.${PropertyType.MULTI_UNIT_HOUSING}`), value: PropertyType.MULTI_UNIT_HOUSING },
-  { name: t(`propertyType.${PropertyType.BED_AND_BREAKFAST}`), value: PropertyType.BED_AND_BREAKFAST },
-  { name: t(`propertyType.${PropertyType.FLOAT_HOME}`), value: PropertyType.FLOAT_HOME }
-]
-
-const strataHotelPropertyType = [
-  { name: t(`propertyType.${PropertyType.STRATA_HOTEL}`), value: PropertyType.STRATA_HOTEL }
-]
-
-const propertyHostTypeOptions = [
-  { value: PropertyHostType.OWNER, label: t(`propertyHostType.${PropertyHostType.OWNER}`) },
-  { value: PropertyHostType.FRIEND_RELATIVE, label: t(`propertyHostType.${PropertyHostType.FRIEND_RELATIVE}`) },
-  { value: PropertyHostType.LONG_TERM_TENANT, label: t(`propertyHostType.${PropertyHostType.LONG_TERM_TENANT}`) }
-]
-
-const rentalUnitSetupOptions = computed(() => [
-  {
-    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.DIFFERENT_PROPERTY}.label`),
-    value: RentalUnitSetupOption.DIFFERENT_PROPERTY,
-    disabled: (isPrRequired.value && !isPrExempt.value) || isHostTypeTenant.value
-  },
-  {
-    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY}.label`),
-    value: RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY,
-    disabled: isHostTypeTenant.value
-  },
-  {
-    label: t(`rentalUnitSetupOption.${RentalUnitSetupOption.PRIMARY_RESIDENCE_OR_SHARED_SPACE}.label`),
-    value: RentalUnitSetupOption.PRIMARY_RESIDENCE_OR_SHARED_SPACE
-  }
-])
-
-// revalidate parcelIdentifier when user changes ownership types
-watch(
-  () => propStore.unitDetails.ownershipType,
-  (newVal) => {
-    if (newVal &&
-        [OwnershipType.OWN, OwnershipType.CO_OWN].includes(newVal) &&
-        propStore.unitDetails.parcelIdentifier !== ''
-    ) {
-      unitDetailsFormRef.value?.validate('parcelIdentifier', { silent: true })
-    }
-    if (newVal &&
-        [OwnershipType.RENT, OwnershipType.OTHER].includes(newVal) &&
-        propStore.unitDetails.parcelIdentifier === ''
-    ) {
-      unitDetailsFormRef.value?.validate('parcelIdentifier', { silent: true })
-    }
-  }
-)
-
-// watch and set Property Host Type as strata if PR Exemption reason is Strata Hotel
-watch(() => reqStore.prRequirements.prExemptionReason, async (val) => {
-  if (val === PrExemptionReason.STRATA_HOTEL) {
-    propStore.unitDetails.propertyType = PropertyType.STRATA_HOTEL
-    await validateForm(unitDetailsFormRef.value, props.isComplete) // validate the form to clear the unit type errors
-  }
-})
-
-// watch and clear unit setup radio if one of the disabled options selected
-watch(() => propStore.unitDetails.hostType, (val) => {
-  const isLongTermTenant = val === PropertyHostType.LONG_TERM_TENANT
-  const isDisabledOptionSelected =
-    [RentalUnitSetupOption.DIFFERENT_PROPERTY, RentalUnitSetupOption.SEPARATE_UNIT_SAME_PROPERTY]
-      .includes(propStore.unitDetails.rentalUnitSetupOption as RentalUnitSetupOption)
-
-  if (isLongTermTenant && isDisabledOptionSelected) {
-    propStore.unitDetails.rentalUnitSetupOption = undefined
-  }
-})
-
-// watch and clear unit setup radio option 1 if PR is not exempt
-watch(() => reqStore.prRequirements.isPropertyPrExempt, (val) => {
-  const isNotExempt = !val
-  const isDisabledOptionSelected = [RentalUnitSetupOption.DIFFERENT_PROPERTY]
-    .includes(propStore.unitDetails.rentalUnitSetupOption as RentalUnitSetupOption)
-
-  if (isNotExempt && isDisabledOptionSelected) {
-    propStore.unitDetails.rentalUnitSetupOption = undefined
-  }
-})
-
-onMounted(async () => {
-  // validate form if step marked as complete
-  if (props.isComplete) {
-    await validateForm(unitDetailsFormRef.value, props.isComplete)
-  }
-})
-</script>
-<template>
-  <UForm
-    v-if="reqStore.showUnitDetailsForm"
-    ref="unitDetailsFormRef"
-    data-testid="form-unit-details"
-    :schema="getUnitDetailsSchema2()"
-    :state="propStore.unitDetails"
-    class="space-y-10"
-  >
-    <ConnectPageSection>
-      <div class="space-y-10 py-10">
-        <!-- property type section -->
-        <ConnectFormSection
-          :title="$t('strr.label.strRentalType')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['propertyType'])"
-        >
-          <UFormGroup id="property-type" v-slot="{ error }" name="propertyType">
-            <USelectMenu
-              v-model="propStore.unitDetails.propertyType"
-              value-attribute="value"
-              size="lg"
-              :color="propStore.unitDetails.propertyType ? 'primary' : 'gray'"
-              :placeholder="$t('strr.label.selectPropertyType')"
-              :options="isStrataHotelExemption ? strataHotelPropertyType : propertyTypes"
-              option-attribute="name"
-              :disabled="isStrataHotelExemption"
-              :aria-label="$t('strr.label.selectPropertyType')"
-              :aria-required="true"
-              :aria-invalid="error !== undefined"
-              :ui="{ base: 'disabled:opacity-50' }"
-              :ui-menu="{
-                label: propStore.unitDetails.propertyType ? 'text-gray-900' : !!error? 'text-red-600': 'text-gray-700'
-              }"
-              data-testid="property-type-select"
-            />
-          </UFormGroup>
-
-          <UAlert
-            v-if="propStore.isUnitNumberRequired"
-            class="mt-6"
-            color="yellow"
-            icon="i-mdi-alert"
-            :close-button="null"
-            variant="subtle"
-            :ui="{
-              inner: 'pt-0',
-              padding: 'p-6',
-              icon: {
-                base: 'flex-shrink-0 w-5 h-5 self-start'
-              }
-            }"
-          >
-            <template #title>
-              <ConnectI18nHelper
-                class="text-bcGovGray-700"
-                :translation-path="
-                  [PropertyType.SECONDARY_SUITE, PropertyType.ACCESSORY_DWELLING]
-                    .includes(propStore.unitDetails.propertyType!) ?
-                      'alert.propertyTypeReqUnitNumber.maybe' :
-                      'alert.propertyTypeReqUnitNumber.always'
-                "
-                :propertytype="$t(`propertyType.${propStore.unitDetails.propertyType}`)"
-              />
-            </template>
-          </UAlert>
-        </ConnectFormSection>
-
-        <!-- Property Host Type -->
-        <ConnectFormSection
-          :title="$t('strr.label.hostType')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['hostType'])"
-        >
-          <UFormGroup name="hostType">
-            <URadioGroup
-              id="host-type-radio-group"
-              v-model="propStore.unitDetails.hostType"
-              :legend="$t('text.hostTypeLegend')"
-              :options="propertyHostTypeOptions"
-              :ui="{ legend: 'sr-only' }"
-              :ui-radio="{ inner: 'space-y-2' }"
-              data-testid="property-host-type"
-            />
-          </UFormGroup>
-        </ConnectFormSection>
-
-        <!-- rental unit setup section -->
-        <ConnectFormSection
-          :title="$t('strr.label.rentalUnitSetup')"
-          :error="isComplete && hasFormErrors(unitDetailsFormRef, ['rentalUnitSetupOption'])"
-        >
-          <UFormGroup
-            id="rental-unit-setup"
-            name="rentalUnitSetupOption"
-            class="w-full"
-          >
-            <ConnectI18nHelper
-              translation-path="strr.label.rentalUnitSetupNote"
-              class="mb-8 block border-y py-4 text-sm italic"
-            />
-            <URadioGroup
-              id="rental-unit-setup-radio-group"
-              v-model="propStore.unitDetails.rentalUnitSetupOption"
-              class="max-w-full"
-              :options="rentalUnitSetupOptions"
-              :legend="$t('text.rentalUnitSetupLegend')"
-              :ui="{ legend: 'sr-only' }"
-              :ui-radio="{ inner: 'space-y-2', label: 'font-bold' }"
-              data-testid="unit-setup-option"
-            >
-              <template #label="{ option }">
-                <span :class="{ 'opacity-50': option.disabled }">
-                  {{ option.label }}
-                </span>
-              </template>
-              <template #help="{ option }">
-                <span :class="{ 'opacity-50': option.disabled }">
-                  <FormDefineYourRentalUnitSetupOptions :option="option" />
-                </span>
-              </template>
-            </URadioGroup>
-          </UFormGroup>
-        </ConnectFormSection>
-      </div>
-    </ConnectPageSection>
-  </UForm>
-</template>
diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/PrRequired.vue b/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/PrRequired.vue
index d8fd177f8..a10e87301 100644
--- a/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/PrRequired.vue
+++ b/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/PrRequired.vue
@@ -5,7 +5,6 @@ const props = defineProps<{ isComplete: boolean }>()
 const { t } = useNuxtApp().$i18n
 const reqStore = usePropertyReqStore()
 const { unitDetails } = storeToRefs(useHostPropertyStore())
-const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 
 const prReqFormRef = ref<Form<any>>()
 const prExemptionOptions = [
@@ -31,7 +30,7 @@ watch(
     if (newVal.isPropertyPrExempt === false) {
       reqStore.prRequirements.prExemptionReason = undefined
       reqStore.strataHotelCategory.category = undefined
-      if (isNewRentalUnitSetupEnabled.value && unitDetails.value.propertyType === PropertyType.STRATA_HOTEL) {
+      if (unitDetails.value.propertyType === PropertyType.STRATA_HOTEL) {
         reqStore.strataHotelCategory.strataHotelRegistrationNumber = undefined
         unitDetails.value.propertyType = undefined // clear property type when disabling Strata Hotel PR requirement
       }
@@ -40,7 +39,7 @@ watch(
     // reset strata hotel category when changing exemption reason
     if (newVal.prExemptionReason !== PrExemptionReason.STRATA_HOTEL) {
       reqStore.strataHotelCategory.category = undefined
-      if (isNewRentalUnitSetupEnabled.value && unitDetails.value.propertyType === PropertyType.STRATA_HOTEL) {
+      if (unitDetails.value.propertyType === PropertyType.STRATA_HOTEL) {
         reqStore.strataHotelCategory.strataHotelRegistrationNumber = undefined
         unitDetails.value.propertyType = undefined // clear property type when disabling Strata Hotel exemption reason
       }
diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/StrataHotelCategory.vue b/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/StrataHotelCategory.vue
index e9a6699a1..e8c69e79e 100644
--- a/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/StrataHotelCategory.vue
+++ b/strr-host-pm-web/app/components/form/DefineYourRental/UnitRequirements/StrataHotelCategory.vue
@@ -7,7 +7,6 @@ const config = useRuntimeConfig().public
 
 const { t } = useNuxtApp().$i18n
 const reqStore = usePropertyReqStore()
-const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 const hostPmModal = useHostPmModals()
 
 const strataHotelCategoryOptions = [
@@ -35,10 +34,6 @@ onMounted(async () => {
   }
 })
 
-const formErrors = computed((): string[] =>
-  isNewRentalUnitSetupEnabled.value ? ['category', 'strataHotelRegistrationNumber'] : ['category']
-)
-
 </script>
 
 <template>
@@ -50,7 +45,8 @@ const formErrors = computed((): string[] =>
     <ConnectFormSection
       :title="$t('label.strataHotelCategory')"
       class="-mx-4 mt-4 md:-mx-10"
-      :error="props.isComplete && hasFormErrors(strataHotelCategoryFormRef, formErrors)"
+      :error="props.isComplete &&
+        hasFormErrors(strataHotelCategoryFormRef, ['category', 'strataHotelRegistrationNumber'])"
       data-testid="strata-hotel-category-section"
     >
       <UFormGroup v-slot="{ error }" name="category">
@@ -77,10 +73,7 @@ const formErrors = computed((): string[] =>
           </template>
         </URadioGroup>
       </UFormGroup>
-      <div
-        v-if="isNewRentalUnitSetupEnabled"
-        class="mt-8"
-      >
+      <div class="mt-8">
         <ConnectFormFieldGroup
           id="strata-platform-reg-number"
           v-model="reqStore.strataHotelCategory.strataHotelRegistrationNumber"
diff --git a/strr-host-pm-web/app/components/form/DefineYourRental/index.vue b/strr-host-pm-web/app/components/form/DefineYourRental/index.vue
index 8148c3f70..9d33e2895 100644
--- a/strr-host-pm-web/app/components/form/DefineYourRental/index.vue
+++ b/strr-host-pm-web/app/components/form/DefineYourRental/index.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
 defineProps<{ isComplete: boolean }>()
-const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
-
 </script>
 
 <template>
@@ -11,14 +9,6 @@ const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
   >
     <FormDefineYourRentalUnitAddress :is-complete="isComplete" />
 
-    <FormDefineYourRentalUnitDetails2
-      v-if="isNewRentalUnitSetupEnabled"
-      :is-complete="isComplete"
-    />
-
-    <FormDefineYourRentalUnitDetails
-      v-else
-      :is-complete="isComplete"
-    />
+    <FormDefineYourRentalUnitDetails :is-complete="isComplete" />
   </div>
 </template>
diff --git a/strr-host-pm-web/app/components/summary/Property.vue b/strr-host-pm-web/app/components/summary/Property.vue
index 3b76fbd9d..c3294bf73 100644
--- a/strr-host-pm-web/app/components/summary/Property.vue
+++ b/strr-host-pm-web/app/components/summary/Property.vue
@@ -3,7 +3,6 @@ const { t } = useNuxtApp().$i18n
 const propertyStore = useHostPropertyStore()
 const { unitAddress, unitDetails } = storeToRefs(propertyStore)
 const { prRequirements, blRequirements, strataHotelCategory } = storeToRefs(usePropertyReqStore())
-const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 
 // step 1 items
 const exemptInfo = computed((): ConnectInfoTableItem[] => [
@@ -43,7 +42,7 @@ const parcelId = computed((): ConnectInfoTableItem[] => [
 ])
 
 const strataHotelRegistrationNumber = computed((): ConnectInfoTableItem[] =>
-  isNewRentalUnitSetupEnabled.value && isExemptionReasonStrata.value
+  isExemptionReasonStrata.value
     ? [
         {
           label: t('strr.label.strataPlatformRegistrationNumber'),
@@ -55,32 +54,27 @@ const strataHotelRegistrationNumber = computed((): ConnectInfoTableItem[] =>
 
 const propertyType = computed((): ConnectInfoTableItem[] => [
   {
-    label:
-    (isNewRentalUnitSetupEnabled.value
-      ? t('strr.label.strRentalType')
-      : t('strr.label.propertyType')),
+    label: t('strr.label.strRentalType'),
     info: t(`propertyType.${unitDetails.value.propertyType}`)
   }])
 
 const newRentalSetupType = computed((): ConnectInfoTableItem[] =>
-  isNewRentalUnitSetupEnabled.value
-    ? [
-        {
-          label: t('strr.label.hostType'),
-          info: t(`propertyHostType.${unitDetails.value.hostType}`)
-        },
-        {
-          label: t('strr.label.rentalUnitSetup'),
-          info: t(`rentalUnitSetupOption.${unitDetails.value.rentalUnitSetupOption}.label`)
-        }
-      ]
-    : []
+  [
+    {
+      label: t('strr.label.hostType'),
+      info: t(`propertyHostType.${unitDetails.value.hostType}`)
+    },
+    {
+      label: t('strr.label.rentalUnitSetup'),
+      info: t(`rentalUnitSetupOption.${unitDetails.value.rentalUnitSetupOption}.label`)
+    }
+  ]
 )
 
 const propertyInfo = computed((): ConnectInfoTableItem[] => [
   { label: t('label.strUnitName'), info: unitAddress.value.address.nickname || t('text.notEntered') },
   { label: t('label.strUnitAddress'), info: '', slot: 'address' },
-  ...(isNewRentalUnitSetupEnabled.value ? parcelId.value : []),
+  ...parcelId.value,
   ...(blRequirements.value.isBusinessLicenceExempt
     ? blExemptInfo.value
     : []
@@ -93,17 +87,7 @@ const propertyInfo = computed((): ConnectInfoTableItem[] => [
   ...strataHotelRegistrationNumber.value,
   { label: '', info: '', slot: 'border' },
   ...propertyType.value,
-  ...newRentalSetupType.value,
-  ...(!isNewRentalUnitSetupEnabled.value
-    ? [
-        { label: t('label.typeOfSpace'), info: t(`rentalUnitType.${unitDetails.value.typeOfSpace}`) },
-        { label: t('strr.label.rentalUnitSetup'), info: t(`rentalUnitSetupType.${unitDetails.value.rentalUnitSetupType}`) }, // eslint-disable-line max-len
-        { label: t('strr.label.numberOfRooms'), info: unitDetails.value.numberOfRoomsForRent },
-        { label: '', info: '', slot: 'border' },
-        { label: t('strr.label.ownershipType'), info: t(`ownershipType.${unitDetails.value.ownershipType}`) },
-        ...parcelId.value
-      ]
-    : [])
+  ...newRentalSetupType.value
 ])
 </script>
 <template>
diff --git a/strr-host-pm-web/app/composables/useHostFeatureFlags.ts b/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
index 3e9d7b477..27469b1cb 100644
--- a/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
+++ b/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
@@ -4,7 +4,6 @@ export const useHostFeatureFlags = () => {
   return {
     isSaveDraftEnabled: isFeatureEnabled('enable-save-draft'),
     isRenewalsEnabled: isFeatureEnabled('enable-registration-renewals'),
-    isNewRentalUnitSetupEnabled: isFeatureEnabled('enable-host-new-rental-unit-setup'),
     isDashboardTableSortingEnabled: isFeatureEnabled('enable-host-dashboard-table-sorting'),
     isNewDashboardEnabled: isFeatureEnabled('enable-new-host-dashboard'),
     isBusinessLicenseDocumentUploadEnabled: isFeatureEnabled('enable-business-license-document-upload'),
diff --git a/strr-host-pm-web/app/enums/ownership-type.ts b/strr-host-pm-web/app/enums/ownership-type.ts
deleted file mode 100644
index 6c1e151ec..000000000
--- a/strr-host-pm-web/app/enums/ownership-type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum OwnershipType {
-  RENT = 'RENT',
-  OWN = 'OWN',
-  CO_OWN = 'CO_OWN',
-  OTHER = 'OTHER'
-}
diff --git a/strr-host-pm-web/app/enums/rental-unit-setup-types.ts b/strr-host-pm-web/app/enums/rental-unit-setup-types.ts
index fd85d5182..5811f4239 100644
--- a/strr-host-pm-web/app/enums/rental-unit-setup-types.ts
+++ b/strr-host-pm-web/app/enums/rental-unit-setup-types.ts
@@ -1,9 +1,3 @@
-export enum RentalUnitSetupType {
-  WHOLE_PRINCIPAL_RESIDENCE = 'WHOLE_PRINCIPAL_RESIDENCE', // The whole Host Principal Residence
-  UNIT_ON_PR_PROPERTY = 'UNIT_ON_PR_PROPERTY', // A whole unit on the same property as the Host Principal Residence (e.g., basement suite)
-  UNIT_NOT_ON_PR_PROPERTY = 'UNIT_NOT_ON_PR_PROPERTY' // Not on the same property as the Host Principal Residence
-}
-
 export enum RentalUnitSetupOption {
   DIFFERENT_PROPERTY = 'DIFFERENT_PROPERTY', // unit on a property you don't live at
   SEPARATE_UNIT_SAME_PROPERTY = 'SEPARATE_UNIT_SAME_PROPERTY', // unit on the property where you live
diff --git a/strr-host-pm-web/app/enums/rental-unit-type.ts b/strr-host-pm-web/app/enums/rental-unit-type.ts
deleted file mode 100644
index 6b182c487..000000000
--- a/strr-host-pm-web/app/enums/rental-unit-type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum RentalUnitType {
-  ENTIRE_HOME = 'ENTIRE_HOME',
-  SHARED_ACCOMMODATION = 'SHARED_ACCOMMODATION'
-}
diff --git a/strr-host-pm-web/app/enums/residence-type.ts b/strr-host-pm-web/app/enums/residence-type.ts
deleted file mode 100644
index 787dbe0c1..000000000
--- a/strr-host-pm-web/app/enums/residence-type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum ResidenceType {
-  SAME_UNIT = 'SAME_UNIT',
-  ANOTHER_UNIT = 'ANOTHER_UNIT'
-}
diff --git a/strr-host-pm-web/app/interfaces/host-api.ts b/strr-host-pm-web/app/interfaces/host-api.ts
index d8455c50e..a09cfad23 100644
--- a/strr-host-pm-web/app/interfaces/host-api.ts
+++ b/strr-host-pm-web/app/interfaces/host-api.ts
@@ -35,11 +35,6 @@ export interface ApiUnitDetails {
   businessLicense?: string
   businessLicenseExpiryDate?: string
   propertyType: PropertyType | undefined
-  ownershipType: OwnershipType | undefined
-  rentalUnitSpaceType: RentalUnitType | undefined
-  hostResidence: ResidenceType | undefined
-  isUnitOnPrincipalResidenceProperty: boolean | undefined
-  numberOfRoomsForRent: number | undefined
   prExemptReason?: PrExemptionReason
   blExemptReason?: string
   strataHotelCategory?: StrataHotelCategory
diff --git a/strr-host-pm-web/app/interfaces/host-ui.ts b/strr-host-pm-web/app/interfaces/host-ui.ts
index 32c1ebb9b..b720fb6bc 100644
--- a/strr-host-pm-web/app/interfaces/host-ui.ts
+++ b/strr-host-pm-web/app/interfaces/host-ui.ts
@@ -11,11 +11,6 @@ export interface UiBlInfo {
 export interface UiUnitDetails {
   parcelIdentifier?: string
   propertyType: PropertyType | undefined
-  ownershipType: OwnershipType | undefined
-  numberOfRoomsForRent: number | undefined
-  rentalUnitSetupType: RentalUnitSetupType | undefined
-  typeOfSpace: RentalUnitType | undefined
-  // fields for new form
   hostType?: PropertyHostType
   rentalUnitSetupOption?: RentalUnitSetupOption
 }
diff --git a/strr-host-pm-web/app/pages/application.vue b/strr-host-pm-web/app/pages/application.vue
index 4fce2c08f..7f1100e17 100644
--- a/strr-host-pm-web/app/pages/application.vue
+++ b/strr-host-pm-web/app/pages/application.vue
@@ -8,7 +8,7 @@ const { setButtonControl, handleButtonLoading } = useButtonControl()
 
 const propertyStore = useHostPropertyStore()
 const propertyReqStore = usePropertyReqStore()
-const { unitDetails, propertyTypeFeeTriggers } = storeToRefs(propertyStore)
+const { unitDetails } = storeToRefs(propertyStore)
 const { showUnitDetailsForm, prRequirements } = storeToRefs(propertyReqStore)
 const { validateOwners } = useHostOwnerStore()
 const documentsStore = useDocumentStore()
@@ -22,7 +22,7 @@ const permitStore = useHostPermitStore()
 const { renewalRegId, application, isRegistrationRenewal } = storeToRefs(permitStore)
 
 const { applicationId, isRenewal } = useRouterParams()
-const { isSaveDraftEnabled, isNewRentalUnitSetupEnabled, isNewDashboardEnabled } = useHostFeatureFlags()
+const { isSaveDraftEnabled, isNewDashboardEnabled } = useHostFeatureFlags()
 const { fetchStrrFees, getApplicationFee } = useHostApplicationFee()
 const loading = ref(false)
 
@@ -114,39 +114,9 @@ const resetFees = () => {
   removeFee(StrrFeeCode.STR_HOST_3)
 }
 
-const setFeeBasedOnProperty = () => {
-  if (!hostFee1.value || !hostFee2.value || !hostFee3.value || !hostFee4.value) {
-    return
-  }
-  resetFees()
-  if (propertyTypeFeeTriggers.value.isEntireHomeAndPrincipalResidence) {
-    addReplaceFee(hostFee1.value)
-  } else if (propertyTypeFeeTriggers.value.isEntireHomeAndNotPrincipalResidence) {
-    addReplaceFee(hostFee2.value)
-  } else if (propertyTypeFeeTriggers.value.isSharedAccommodation) {
-    if (propertyTypeFeeTriggers.value.isBBorRecProperty) {
-      addReplaceFee(hostFee3.value)
-    } else {
-      hostFee4.value.quantity = unitDetails.value.numberOfRoomsForRent || 1
-      addReplaceFee(hostFee4.value)
-    }
-  } else {
-    // set placeholder
-    resetFees()
-  }
-  hostFee4.value.quantityDesc = hostFee4.value.quantity !== undefined && hostFee4.value.quantity > 1
-    ? t('strr.word.room', hostFee4.value.quantity)
-    : undefined
-}
-
-// manage fees only when typeOfSpace, rentalUnitSetupType or propertyType change
 // for new rental unit form - do not calculate the fees, it will be calculated on the last step
-watch(unitDetails, (newVal) => {
-  if (newVal.typeOfSpace && newVal.rentalUnitSetupType && newVal.propertyType && !isNewRentalUnitSetupEnabled.value) {
-    setFeeBasedOnProperty()
-  } else {
-    resetFees()
-  }
+watch(unitDetails, () => {
+  resetFees()
 }, { deep: true })
 
 // stepper stuff
@@ -378,17 +348,16 @@ watch(() => prRequirements.value.prExemptionReason, async (newVal) => {
   }
 })
 
-// remove rental docs if ownership type !== rent
-watch(() => unitDetails.value.ownershipType, async (newVal) => {
+// remove rental docs if host type is not tenant
+watch(() => unitDetails.value.hostType, async (newVal) => {
   // only execute if unit details form shown - (application has been started)
-  if (showUnitDetailsForm.value && newVal !== undefined && newVal !== OwnershipType.RENT) {
+  if (showUnitDetailsForm.value && newVal !== undefined && newVal !== PropertyHostType.LONG_TERM_TENANT) {
     await documentsStore.removeDocumentsByType(documentsStore.documentCategories.rental)
   }
 })
 
 // watch the Stepper to calculate application fees on Review and Confirm step only
 watch(activeStepIndex, (val) => {
-  if (!isNewRentalUnitSetupEnabled.value) { return } // get fees for new rental unit setup only
   const { propertyType, rentalUnitSetupOption } = unitDetails.value
   const isReviewStep = val === 3 // get fees when on Review step only
   const hasValidSteps = steps.value.slice(0, 3).every(step => step.isValid) // biz requirement: steps 1-3 must be valid
diff --git a/strr-host-pm-web/app/stores/document.ts b/strr-host-pm-web/app/stores/document.ts
index 0dc8ce87e..9f479183d 100644
--- a/strr-host-pm-web/app/stores/document.ts
+++ b/strr-host-pm-web/app/stores/document.ts
@@ -17,7 +17,6 @@ export const useDocumentStore = defineStore('host/document', () => {
 
   // check if Host Type is Renter or long-term Tenant to determine which PR docs are required
   const isTenant = computed(() =>
-    propStore.unitDetails.ownershipType === OwnershipType.RENT ||
     propStore.unitDetails.hostType === PropertyHostType.LONG_TERM_TENANT
   )
 
@@ -421,10 +420,9 @@ export const useDocumentStore = defineStore('host/document', () => {
       // create payload
       const formData = new FormData()
       formData.append('file', uiDoc.file)
-      // TODO: update api to accept and return the following form data fields
-      // formData.append('documentType', uiDoc.type)
-      // uiDoc.uploadStep && formData.append('uploadStep', uiDoc.uploadStep)
-      // uiDoc.uploadDate && formData.append('uploadDate', uiDoc.uploadDate)
+      formData.append('documentType', uiDoc.type)
+      uiDoc.uploadStep && formData.append('uploadStep', uiDoc.uploadStep)
+      uiDoc.uploadDate && formData.append('uploadDate', uiDoc.uploadDate)
 
       // submit file
       const res = await $strrApi<ApiDocument>('/documents', {
diff --git a/strr-host-pm-web/app/stores/hostApplication.ts b/strr-host-pm-web/app/stores/hostApplication.ts
index 2cf660a8c..e404e7919 100644
--- a/strr-host-pm-web/app/stores/hostApplication.ts
+++ b/strr-host-pm-web/app/stores/hostApplication.ts
@@ -13,7 +13,6 @@ export const useHostApplicationStore = defineStore('host/application', () => {
   })
   const permitStore = useHostPermitStore()
   const { isRegistrationRenewal, registration, application } = storeToRefs(permitStore)
-  const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 
   const getEmptyConfirmation = () => ({
     agreedToRentalAct: false,
@@ -88,14 +87,6 @@ export const useHostApplicationStore = defineStore('host/application', () => {
   const submitApplication = async (isDraft = false, applicationId?: string) => {
     const body = createApplicationBody()
 
-    // clean up unit details to satisfy api schema
-    if (isNewRentalUnitSetupEnabled.value) {
-      delete body.registration.unitDetails.ownershipType
-      delete body.registration.unitDetails.rentalUnitSpaceType
-      delete body.registration.unitDetails.numberOfRoomsForRent
-      delete body.registration.unitDetails.isUnitOnPrincipalResidenceProperty
-    }
-
     const res = await postApplication<HostApplicationPayload, HostApplicationResp>(
       body,
       isDraft,
diff --git a/strr-host-pm-web/app/stores/hostProperty.ts b/strr-host-pm-web/app/stores/hostProperty.ts
index 80b23e45f..806120268 100644
--- a/strr-host-pm-web/app/stores/hostProperty.ts
+++ b/strr-host-pm-web/app/stores/hostProperty.ts
@@ -2,7 +2,6 @@ import { z } from 'zod'
 
 export const useHostPropertyStore = defineStore('host/property', () => {
   const { t } = useNuxtApp().$i18n
-  const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
   const propertyReqStore = usePropertyReqStore()
 
   // rental unit address stuff
@@ -182,48 +181,8 @@ export const useHostPropertyStore = defineStore('host/property', () => {
     }
   }
 
-  // unit details stuff
   const getUnitDetailsSchema = () => z.object({
     parcelIdentifier: getOptionalPID(t('validation.parcelIdentifier')),
-    propertyType: z.enum([
-      PropertyType.ACCESSORY_DWELLING,
-      PropertyType.BED_AND_BREAKFAST,
-      PropertyType.CONDO_OR_APT,
-      PropertyType.FLOAT_HOME,
-      PropertyType.MULTI_UNIT_HOUSING,
-      PropertyType.RECREATIONAL,
-      PropertyType.SECONDARY_SUITE,
-      PropertyType.SINGLE_FAMILY_HOME,
-      PropertyType.STRATA_HOTEL,
-      PropertyType.TOWN_HOME
-    ], {
-      errorMap: () => ({ message: t('validation.propertyType') })
-    }),
-    ownershipType: z.enum([OwnershipType.CO_OWN, OwnershipType.OWN, OwnershipType.RENT, OwnershipType.OTHER], {
-      errorMap: () => ({ message: t('validation.ownershipType') })
-    }),
-    typeOfSpace: z.enum([RentalUnitType.ENTIRE_HOME, RentalUnitType.SHARED_ACCOMMODATION], {
-      errorMap: () => ({ message: t('validation.typeOfSpace') })
-    }),
-    rentalUnitSetupType: z.enum([
-      RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE,
-      RentalUnitSetupType.UNIT_ON_PR_PROPERTY,
-      RentalUnitSetupType.UNIT_NOT_ON_PR_PROPERTY
-    ], {
-      errorMap: () => ({ message: t('validation.rentalUnitSetupType') })
-    }),
-    numberOfRoomsForRent: z
-      .number({
-        required_error: t('validation.numberOfRooms.empty'),
-        invalid_type_error: t('validation.numberOfRooms.invalidInput')
-      })
-      .int({ message: t('validation.numberOfRooms.invalidInput') })
-      .min(0)
-      .max(5000)
-  })
-
-  // validation schema for new property setup - enabled by feature flag isNewRentalUnitSetupEnabled
-  const getUnitDetailsSchema2 = () => z.object({
     propertyType: z.enum([
       PropertyType.SINGLE_FAMILY_HOME,
       PropertyType.SECONDARY_SUITE,
@@ -254,11 +213,6 @@ export const useHostPropertyStore = defineStore('host/property', () => {
   const getEmptyUnitDetails = (): UiUnitDetails => ({
     parcelIdentifier: '',
     propertyType: undefined,
-    ownershipType: undefined,
-    rentalUnitSetupType: undefined,
-    typeOfSpace: undefined,
-    numberOfRoomsForRent: 0,
-    // fields for new form
     hostType: undefined,
     rentalUnitSetupOption: undefined
   })
@@ -266,7 +220,7 @@ export const useHostPropertyStore = defineStore('host/property', () => {
   const unitDetails = ref<UiUnitDetails>(getEmptyUnitDetails())
 
   const validateUnitDetails = (returnBool = false): MultiFormValidationResult | boolean => {
-    const schemaToValidate = isNewRentalUnitSetupEnabled.value ? getUnitDetailsSchema2() : getUnitDetailsSchema()
+    const schemaToValidate = getUnitDetailsSchema()
 
     const result = validateSchemaAgainstState(
       schemaToValidate,
@@ -289,23 +243,6 @@ export const useHostPropertyStore = defineStore('host/property', () => {
     PropertyType.STRATA_HOTEL].includes(unitDetails.value.propertyType)
   )
 
-  const isOwnerOrCoOwner = computed(() => unitDetails.value.ownershipType && [
-    OwnershipType.OWN,
-    OwnershipType.CO_OWN
-  ].includes(unitDetails.value.ownershipType))
-
-  const propertyTypeFeeTriggers = computed(() => ({
-    isEntireHomeAndPrincipalResidence:
-      unitDetails.value.typeOfSpace === RentalUnitType.ENTIRE_HOME &&
-      unitDetails.value.rentalUnitSetupType === RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE,
-    isEntireHomeAndNotPrincipalResidence:
-      unitDetails.value.typeOfSpace === RentalUnitType.ENTIRE_HOME &&
-      unitDetails.value.rentalUnitSetupType !== RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE,
-    isSharedAccommodation: unitDetails.value.typeOfSpace === RentalUnitType.SHARED_ACCOMMODATION,
-    isBBorRecProperty: unitDetails.value.propertyType &&
-      [PropertyType.BED_AND_BREAKFAST, PropertyType.RECREATIONAL].includes(unitDetails.value.propertyType)
-  }))
-
   const resetUnitAddress = (preserveNickname = false) => {
     const nickname = unitAddress.value.address.nickname
     unitAddress.value = getEmptyUnitAddress()
@@ -343,13 +280,10 @@ export const useHostPropertyStore = defineStore('host/property', () => {
     validateBusinessLicense,
     // unitDetailsSchema,
     getUnitDetailsSchema,
-    getUnitDetailsSchema2,
     getEmptyUnitDetails,
     unitDetails,
     validateUnitDetails,
     isUnitNumberRequired,
-    isOwnerOrCoOwner,
-    propertyTypeFeeTriggers,
     useManualAddressInput,
     hasNoStreetAddress,
     resetUnitAddress,
diff --git a/strr-host-pm-web/app/stores/propertyRequirements.ts b/strr-host-pm-web/app/stores/propertyRequirements.ts
index 170b2bbc0..0017e9666 100644
--- a/strr-host-pm-web/app/stores/propertyRequirements.ts
+++ b/strr-host-pm-web/app/stores/propertyRequirements.ts
@@ -7,7 +7,6 @@ export const usePropertyReqStore = defineStore('property/requirements', () => {
   const { $strrApi } = useNuxtApp()
 
   const propStore = useHostPropertyStore()
-  const { isNewRentalUnitSetupEnabled } = useHostFeatureFlags()
 
   const loadingReqs = ref<boolean>(false)
   const propertyReqs = ref<PropertyRequirements>({} as PropertyRequirements)
@@ -71,11 +70,8 @@ export const usePropertyReqStore = defineStore('property/requirements', () => {
         ], {
           errorMap: () => ({ message: t('validation.strataHotelCategory') })
         })
-        : z.any().optional()
-    }
-    // additional validation for new rental unit setup (optional field with format validation)
-    if (isNewRentalUnitSetupEnabled.value) {
-      schema.strataHotelRegistrationNumber = z
+        : z.any().optional(),
+      strataHotelRegistrationNumber: z
         .string()
         .optional()
         .refine(val => !val || /^ST\d{9}$/.test(val),
diff --git a/strr-host-pm-web/app/utils/host-formatting.ts b/strr-host-pm-web/app/utils/host-formatting.ts
index d4ed3a49b..634a1263d 100644
--- a/strr-host-pm-web/app/utils/host-formatting.ts
+++ b/strr-host-pm-web/app/utils/host-formatting.ts
@@ -74,17 +74,6 @@ export function formatHostUnitDetailsAPI (
 ): ApiUnitDetails {
   return {
     propertyType: unitDetails.propertyType,
-    ownershipType: unitDetails.ownershipType,
-    numberOfRoomsForRent: unitDetails.numberOfRoomsForRent,
-    isUnitOnPrincipalResidenceProperty: unitDetails.rentalUnitSetupType === undefined
-      ? undefined
-      : unitDetails.rentalUnitSetupType !== RentalUnitSetupType.UNIT_NOT_ON_PR_PROPERTY,
-    hostResidence: unitDetails.rentalUnitSetupType === undefined
-      ? undefined
-      : unitDetails.rentalUnitSetupType === RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE
-        ? ResidenceType.SAME_UNIT
-        : ResidenceType.ANOTHER_UNIT,
-    rentalUnitSpaceType: unitDetails.typeOfSpace,
     ...(unitDetails.parcelIdentifier ? { parcelIdentifier: unitDetails.parcelIdentifier } : {}),
     ...(blInfo.businessLicense ? { businessLicense: blInfo.businessLicense } : {}),
     ...(blInfo.businessLicenseExpiryDate ? { businessLicenseExpiryDate: blInfo.businessLicenseExpiryDate } : {}),
@@ -100,19 +89,8 @@ export function formatHostUnitDetailsAPI (
 }
 
 export function formatHostUnitDetailsUI (unitDetails: ApiUnitDetails): UiUnitDetails {
-  const rentalSetupType = unitDetails.isUnitOnPrincipalResidenceProperty === undefined
-    ? undefined
-    : unitDetails.isUnitOnPrincipalResidenceProperty
-      ? unitDetails.hostResidence === ResidenceType.SAME_UNIT
-        ? RentalUnitSetupType.WHOLE_PRINCIPAL_RESIDENCE
-        : RentalUnitSetupType.UNIT_ON_PR_PROPERTY
-      : RentalUnitSetupType.UNIT_NOT_ON_PR_PROPERTY
   return {
     propertyType: unitDetails.propertyType,
-    ownershipType: unitDetails.ownershipType,
-    numberOfRoomsForRent: unitDetails.numberOfRoomsForRent,
-    rentalUnitSetupType: rentalSetupType,
-    typeOfSpace: unitDetails.rentalUnitSpaceType,
     ...(unitDetails.parcelIdentifier ? { parcelIdentifier: unitDetails.parcelIdentifier } : {}),
     ...(unitDetails.hostType ? { hostType: unitDetails.hostType } : {}),
     ...(unitDetails.rentalUnitSetupOption ? { rentalUnitSetupOption: unitDetails.rentalUnitSetupOption } : {})
diff --git a/strr-host-pm-web/i18n/locales/en-CA.ts b/strr-host-pm-web/i18n/locales/en-CA.ts
index ea830b262..b32bb895d 100644
--- a/strr-host-pm-web/i18n/locales/en-CA.ts
+++ b/strr-host-pm-web/i18n/locales/en-CA.ts
@@ -166,7 +166,6 @@ export default {
       individualsBusinesses: 'Individuals and Businesses',
       listingLinkOpt: 'Listing Link (Optional)',
       numberOfRooms: 'Number of Bedrooms for Rent',
-      ownershipType: 'Ownership Type',
       nicknameOpt: 'Nickname (Optional)',
       parcelIdentifier: 'Parcel Identifier (Required if one exists)',
       parcelIdentifierOpt: 'Parcel Identifier (Optional)',
@@ -329,7 +328,6 @@ export default {
     strUnitAddress: 'Short-Term Rental Unit Residential Address',
     strUnitName: 'Short-Term Rental Unit Nickname',
     strUnitNameOpt: 'Short-Term Rental Unit Nickname (Optional)',
-    typeOfSpace: 'Type of Space',
     chooseDocs: 'Choose type of supporting document to upload',
     fileUpload: 'File Upload',
     localGovBL: 'Local Government Business Licence',
@@ -444,7 +442,6 @@ export default {
     followingDocsRequired: 'The following documentation is required for this registration:',
     followingDocsMayBeRequired: 'The following documentation may be required for this registration:',
     rentalUnitSetupLegend: 'Required: Select the set-up of the property, host principal residence, and rental unit.',
-    typeOfSpaceLegend: 'Required: Select the type of space of the rental unit.',
     hostTypeLegend: 'Required',
     thisPropIsInLocWithReqs: 'This property is in a location where the following requirements apply:',
     thisPropCouldBeInLocWithReqs: 'This property could be in a location where the following requirements apply:',
@@ -566,15 +563,12 @@ export default {
       empty: 'Please specify the number of rooms available for rent',
       invalidInput: 'Please enter a valid number of rooms (e.g., 5)'
     },
-    ownershipType: 'Please select the ownership type of this rental unit',
     parcelIdentifier: 'The parcel identifier must be a nine-digit number',
     propertyType: 'Please select the rental unit type of this rental unit',
     strPropertyType: 'Please select a short-term rental property/unit type',
     onlineListings: 'Please enter a valid URL (i.e. https://www.bcregistry.gov.bc.ca)',
-    rentalUnitSetupType: 'Please select the setup type of the rental unit',
     rentalUnitSetupOption: 'Please select a rental unit setup',
     hostType: 'Please select a property host type',
-    typeOfSpace: 'Please select the type of space of the unit',
     ownerRole: 'Please select the role',
     missingReqDocs: 'Missing required documents. Please see above for details.',
     blExpiryDate: 'The expiry date must be greater than today and in less than 1 year.',
@@ -660,12 +654,6 @@ export default {
     LONG_TERM_TENANT: 'The long-term tenant of this unit',
     undefined: 'Not Selected'
   },
-  rentalUnitSetupType: {
-    WHOLE_PRINCIPAL_RESIDENCE: "This unit is the host's principal residence or a room within the host's principal residence", // TODO: update enum to not be whole pr ???
-    UNIT_ON_PR_PROPERTY: "This unit is not the host's principal residence but it's on the same property",
-    UNIT_NOT_ON_PR_PROPERTY: "This unit is not on same property as host's principal residence",
-    undefined: 'Not Selected'
-  },
   rentalUnitSetupOption: {
     DIFFERENT_PROPERTY: {
       label: "Option 1: You are short-term renting a unit on a property you don't live at",
@@ -690,13 +678,6 @@ export default {
       label: 'Not Selected'
     }
   },
-  ownershipType: {
-    RENT: 'Renter',
-    OWN: 'Owner',
-    CO_OWN: 'Co-owner',
-    OTHER: 'Other',
-    undefined: 'Not Selected'
-  },
   tooltip: {
     pid: 'You can find your Parcel Identifier (PID) on your Property Assessment Notice from BC Assessment. Alternatively, visit the BC Assessment website, search for your civic address, and look for the PID under ‘Legal Description and Parcel ID’.',
     noticeOfConsideration: 'You have received a Notice of Consideration',
diff --git a/strr-host-pm-web/tests/mocks/mockedData.ts b/strr-host-pm-web/tests/mocks/mockedData.ts
index 882fbe762..1f6705ca5 100644
--- a/strr-host-pm-web/tests/mocks/mockedData.ts
+++ b/strr-host-pm-web/tests/mocks/mockedData.ts
@@ -92,14 +92,9 @@ export const mockApplication: HostApplicationResp = {
       unitNumber: '101'
     },
     unitDetails: {
-      hostResidence: ResidenceType.SAME_UNIT,
       hostType: PropertyHostType.OWNER,
-      isUnitOnPrincipalResidenceProperty: true,
-      numberOfRoomsForRent: 2,
-      ownershipType: OwnershipType.OWN,
       parcelIdentifier: '123-456-789',
       propertyType: PropertyType.CONDO_OR_APT,
-      rentalUnitSpaceType: RentalUnitType.ENTIRE_HOME,
       businessLicense: '123123123',
       strataHotelCategory: StrataHotelCategory.FULL_SERVICE
     }
@@ -177,13 +172,8 @@ export const mockHostRegistration: HostRegistrationResp = {
   primaryContact: mockPrimaryContactPerson,
   unitAddress: mockUnitAddress,
   unitDetails: {
-    hostResidence: ResidenceType.SAME_UNIT,
-    isUnitOnPrincipalResidenceProperty: true,
-    numberOfRoomsForRent: 2,
-    ownershipType: OwnershipType.OWN,
     parcelIdentifier: '123-456-789',
     propertyType: PropertyType.CONDO_OR_APT,
-    rentalUnitSpaceType: RentalUnitType.ENTIRE_HOME,
     businessLicense: '123123123'
   },
   strRequirements: {
diff --git a/strr-host-pm-web/tests/unit/application.spec.ts b/strr-host-pm-web/tests/unit/application.spec.ts
index 9231b9db5..1c0fbffb0 100644
--- a/strr-host-pm-web/tests/unit/application.spec.ts
+++ b/strr-host-pm-web/tests/unit/application.spec.ts
@@ -10,7 +10,6 @@ import {
   FormAddOwners,
   FormDefineYourRentalUnitAddress,
   FormDefineYourRentalUnitDetails,
-  FormDefineYourRentalUnitDetails2,
   FormReview,
   FormUnitAddressAutoComplete,
   FormUnitAddressManual,
@@ -35,9 +34,8 @@ vi.mock('@/stores/hostProperty', () => ({
     validateUnitAddress: () => true,
     validateUnitDetails: () => true,
     validateBusinessLicense: () => true,
-    propertyTypeFeeTriggers: ref([]),
     getUnitAddressSchema: () => ({ address: mockApplication.registration.unitAddress }),
-    getUnitDetailsSchema2: () => vi.fn(),
+    getUnitDetailsSchema: () => vi.fn(),
     getUnitAddressSchema2: () => vi.fn(),
     resetUnitAddress: vi.fn(),
     resetUnitDetails: vi.fn(),
@@ -158,7 +156,6 @@ const isEnhancedDocumentUploadEnabled = ref(false)
 vi.mock('@/composables/useHostFeatureFlags', () => ({
   useHostFeatureFlags: () => ({
     isSaveDraftEnabled: ref(true),
-    isNewRentalUnitSetupEnabled: ref(true),
     isNewDashboardEnabled: ref(false),
     isEnhancedDocumentUploadEnabled
   })
@@ -279,8 +276,7 @@ describe('Rental Application - Step 1', () => {
     expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(0)
 
     expect(wrapper.findComponent(FormDefineYourRentalUnitAddress).exists()).toBe(true)
-    expect(wrapper.findComponent(FormDefineYourRentalUnitDetails).exists()).toBe(false)
-    expect(wrapper.findComponent(FormDefineYourRentalUnitDetails2).exists()).toBe(true)
+    expect(wrapper.findComponent(FormDefineYourRentalUnitDetails).exists()).toBe(true)
 
     expect(wrapper.find('[data-testid="rental-unit-address-nickname"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="alert-renewal-address-change"]').exists()).toBe(true)
@@ -288,7 +284,7 @@ describe('Rental Application - Step 1', () => {
     expect(wrapper.findComponent(FormUnitAddressAutoComplete).exists()).toBe(true)
     expect(wrapper.findComponent(FormUnitAddressManual).exists()).toBe(true)
 
-    const rentalUnitDetails = wrapper.findComponent(FormDefineYourRentalUnitDetails2)
+    const rentalUnitDetails = wrapper.findComponent(FormDefineYourRentalUnitDetails)
 
     expect(rentalUnitDetails.find('[data-testid="property-type-select"]').exists()).toBe(true)
     expect(rentalUnitDetails.find('[data-testid="property-host-type"]').exists()).toBe(true)
diff --git a/strr-host-pm-web/tests/unit/summary-property.spec.ts b/strr-host-pm-web/tests/unit/summary-property.spec.ts
index 86547962a..089e9db45 100644
--- a/strr-host-pm-web/tests/unit/summary-property.spec.ts
+++ b/strr-host-pm-web/tests/unit/summary-property.spec.ts
@@ -23,10 +23,6 @@ vi.mock('@/stores/hostProperty', () => ({
     }),
     unitDetails: ref({
       propertyType: mockApplication.registration!.unitDetails!.propertyType,
-      typeOfSpace: mockApplication.registration!.unitDetails!.rentalUnitSpaceType,
-      rentalUnitSetupType: mockApplication.registration!.unitDetails!.rentalUnitSpaceType,
-      numberOfRoomsForRent: mockApplication.registration!.unitDetails!.numberOfRoomsForRent!.toString(),
-      ownershipType: mockApplication.registration!.unitDetails!.ownershipType,
       parcelIdentifier: mockApplication.registration!.unitDetails!.parcelIdentifier
     }),
     blInfo: ref({
@@ -52,12 +48,6 @@ vi.mock('@/stores/propertyRequirements', () => ({
   })
 }))
 
-vi.mock('@/composables/useHostFeatureFlags', () => ({
-  useHostFeatureFlags: () => ({
-    isNewRentalUnitSetupEnabled: ref(false)
-  })
-}))
-
 describe('SummaryProperty Component', () => {
   let wrapper: any
 
@@ -69,7 +59,6 @@ describe('SummaryProperty Component', () => {
 
   it('displays property details correctly', () => {
     expect(wrapper.html()).toContain($t('propertyType.CONDO_OR_APT'))
-    expect(wrapper.html()).toContain($t('rentalUnitType.ENTIRE_HOME'))
   })
 
   it('handles PR exemption correctly', () => {