diff --git a/frontend/src/components/DeleteLinkedDocModal.vue b/frontend/src/components/DeleteLinkedDocModal.vue
index 224ee9b9..eb5e4694 100644
--- a/frontend/src/components/DeleteLinkedDocModal.vue
+++ b/frontend/src/components/DeleteLinkedDocModal.vue
@@ -2,7 +2,7 @@
   <Dialog v-model="show" :options="{ size: 'xl' }">
     <template #body v-if="!confirmDeleteInfo.show">
       <div class="bg-surface-modal px-4 pb-6 pt-5 sm:px-6">
-        <div class="mb-6 flex items-center justify-between">
+        <div class="mb-4 flex items-center justify-between">
           <div>
             <h3 class="text-2xl leading-6 text-ink-gray-9 font-semibold">
               {{
@@ -20,7 +20,7 @@
         </div>
         <div>
           <div v-if="linkedDocs?.length > 0">
-            <span class="text-ink-gray-5">
+            <span class="text-ink-gray-5 text-base">
               {{
                 __(
                   'Delete or unlink these linked documents before deleting this document',
@@ -48,7 +48,7 @@
               :unlinkLinkedDoc="unlinkLinkedDoc"
             />
           </div>
-          <div v-if="linkedDocs?.length == 0" class="text-ink-gray-5">
+          <div v-if="linkedDocs?.length == 0" class="text-ink-gray-5 text-base">
             {{
               __('Are you sure you want to delete {0} - {1}?', [
                 props.doctype,
@@ -121,11 +121,11 @@
             </Button>
           </div>
         </div>
-        <div class="text-ink-gray-5">
+        <div class="text-ink-gray-5 text-base">
           {{ confirmDeleteInfo.message }}
         </div>
         <div class="flex flex-row-reverse gap-2 mt-6">
-          <Button variant="ghost" @click="confirmDeleteInfo.show = false">
+          <Button variant="ghost" @click="cancel()">
             {{ __('Cancel') }}
           </Button>
           <Button
@@ -199,6 +199,11 @@ const linkedDocs = computed(() => {
   )
 })
 
+const cancel = () => {
+  confirmDeleteInfo.value.show = false
+  viewControls.value.updateSelections([])
+}
+
 const unlinkLinkedDoc = (doc) => {
   let selectedDocs = []
   if (viewControls.value.selections.length > 0) {
diff --git a/frontend/src/components/ListViews/LinkedDocsListView.vue b/frontend/src/components/ListViews/LinkedDocsListView.vue
index d9cdd4fb..9345846e 100644
--- a/frontend/src/components/ListViews/LinkedDocsListView.vue
+++ b/frontend/src/components/ListViews/LinkedDocsListView.vue
@@ -134,21 +134,6 @@ const viewLinkedDoc = (doc) => {
 }
 
 const getDoctypeName = (doctype) => {
-  switch (doctype) {
-    case 'CRM Lead':
-      return 'Lead'
-    case 'CRM Call Log':
-      return 'Call Log'
-    case 'CRM Task':
-      return 'Task'
-    case 'Contact':
-      return 'Contact'
-    case 'CRM Organization':
-      return 'Organization'
-    case 'FCRM Note':
-      return 'Note'
-    default:
-      return doctype
-  }
+  return doctype.replace(/^(CRM|FCRM)\s*/, '')
 }
 </script>
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 27bc88e4..b77f5ce7 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -172,7 +172,6 @@
     :errorTitle="errorTitle"
     :errorMessage="errorMessage"
   />
-  <AddressModal v-model="showAddressModal" v-model:address="_address" />
   <DeleteLinkedDocModal
     v-if="showDeleteLinkedDocModal"
     v-model="showDeleteLinkedDocModal"
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index f39fa9f2..769d345f 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -164,12 +164,6 @@
     :errorTitle="errorTitle"
     :errorMessage="errorMessage"
   />
-  <QuickEntryModal
-    v-if="showQuickEntryModal"
-    v-model="showQuickEntryModal"
-    doctype="CRM Organization"
-  />
-  <AddressModal v-model="showAddressModal" v-model:address="_address" />
   <DeleteLinkedDocModal
     v-if="showDeleteLinkedDocModal"
     v-model="showDeleteLinkedDocModal"
@@ -306,13 +300,6 @@ async function deleteOrganization() {
   showDeleteLinkedDocModal.value = true
 }
 
-function validateFile(file) {
-  let extn = file.name.split('.').pop().toLowerCase()
-  if (!['png', 'jpg', 'jpeg'].includes(extn)) {
-    return __('Only PNG and JPG images are allowed')
-  }
-}
-
 async function changeOrganizationImage(file) {
   await call('frappe.client.set_value', {
     doctype: 'CRM Organization',