diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.html b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
index 6ff52ce7b..2096ba64a 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.html
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
@@ -46,14 +46,16 @@
             } @else if (block.type === 'multi-select-input' && block.values) {
               <div class="flex flex-column gap-4 p-4">
                 @for (value of block.values; track $index) {
-                  <p class="text-no-transform">{{ value }}</p>
+                  @if (value) {
+                    <p class="text-no-transform">{{ value }}</p>
+                  }
                 }
               </div>
             } @else if (block.type === 'page-heading' && block.value) {
               <h1 class="pb-4 text-no-transform" [class.mt-4]="$index !== 0">{{ block.value }}</h1>
             } @else if ((block.type === 'subsection-heading' || block.type === 'question-label') && block.value) {
               <h3 class="pb-4 text-no-transform">{{ block.value }}</h3>
-            } @else if (block.value !== 'select-input-option') {
+            } @else if (block.value && block.value !== 'select-input-option') {
               <p class="pb-4 text-no-transform">{{ block.value }}</p>
             }
           }
diff --git a/src/app/shared/components/files-tree/files-tree.component.html b/src/app/shared/components/files-tree/files-tree.component.html
index 73bb96766..f02951db3 100644
--- a/src/app/shared/components/files-tree/files-tree.component.html
+++ b/src/app/shared/components/files-tree/files-tree.component.html
@@ -53,7 +53,9 @@
             </div>
 
             <div class="files-table-cell">
-              {{ file.kind === 'file' ? file.extra.downloads + ' ' + ('common.labels.downloads' | translate) : '' }}
+              @if (file.extra.downloads) {
+                {{ file.kind === 'file' ? file.extra.downloads + ' ' + ('common.labels.downloads' | translate) : '' }}
+              }
             </div>
 
             <div class="files-table-cell">
diff --git a/src/app/shared/factories/files-tree-selectors.factory.ts b/src/app/shared/factories/files-tree-selectors.factory.ts
deleted file mode 100644
index e1585d9ce..000000000
--- a/src/app/shared/factories/files-tree-selectors.factory.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { select } from '@ngxs/store';
-
-import { ActivatedRoute } from '@angular/router';
-
-import { PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper';
-import { ProjectFilesSelectors } from '@osf/features/project/files/store';
-import { RegistryFilesSelectors } from '@osf/features/registry/store/registry-files';
-import { ResourceType } from '@shared/enums';
-import { FilesTreeSelectors } from '@shared/tokens/files-tree-selectors.token';
-
-export function filesTreeSelectorsFactory(route: ActivatedRoute): FilesTreeSelectors {
-  const context = route.snapshot.data['context'] as ResourceType;
-
-  switch (context) {
-    case ResourceType.Project:
-      return {
-        isFilesLoading: () => select(ProjectFilesSelectors.isFilesLoading),
-        getFiles: () => select(ProjectFilesSelectors.getFiles),
-        getCurrentFolder: () => select(ProjectFilesSelectors.getCurrentFolder),
-      };
-    case ResourceType.Registration:
-      return {
-        isFilesLoading: () => select(RegistryFilesSelectors.isFilesLoading),
-        getFiles: () => select(RegistryFilesSelectors.getFiles),
-        getCurrentFolder: () => select(RegistryFilesSelectors.getCurrentFolder),
-      };
-    case ResourceType.Preprint:
-      return {
-        isFilesLoading: () => select(PreprintStepperSelectors.areProjectFilesLoading),
-        getFiles: () => select(PreprintStepperSelectors.getProjectFiles),
-        getCurrentFolder: () => select(PreprintStepperSelectors.getCurrentFolder),
-      };
-    default:
-      throw new Error(`Unknown context for FilesTreeSelectors: ${context}`);
-  }
-}
diff --git a/src/app/shared/factories/index.ts b/src/app/shared/factories/index.ts
deleted file mode 100644
index e4ce3fcb6..000000000
--- a/src/app/shared/factories/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './files-tree-selectors.factory';
diff --git a/src/app/shared/tokens/files-tree-selectors.token.ts b/src/app/shared/tokens/files-tree-selectors.token.ts
deleted file mode 100644
index ae1112950..000000000
--- a/src/app/shared/tokens/files-tree-selectors.token.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { InjectionToken, Signal } from '@angular/core';
-
-import { OsfFile } from '@shared/models';
-
-export interface FilesTreeSelectors {
-  isFilesLoading: () => Signal<boolean>;
-  getFiles: () => Signal<OsfFile[]>;
-  getCurrentFolder: () => Signal<OsfFile | null>;
-}
-
-export const FILES_TREE_SELECTORS = new InjectionToken<FilesTreeSelectors>('FILES_TREE_SELECTORS');
diff --git a/src/app/shared/tokens/index.ts b/src/app/shared/tokens/index.ts
index ed5bbff66..82d99a590 100644
--- a/src/app/shared/tokens/index.ts
+++ b/src/app/shared/tokens/index.ts
@@ -1,2 +1 @@
-export * from './files-tree-selectors.token';
 export * from './subjects.token';