diff --git a/backend/toolshed/admin.py b/backend/toolshed/admin.py
index cea1e9b..d813ac7 100644
--- a/backend/toolshed/admin.py
+++ b/backend/toolshed/admin.py
@@ -18,11 +18,10 @@ class ItemPropertyInline(admin.TabularInline):
 
 
 class InventoryItemAdmin(admin.ModelAdmin):
-    list_display = ('name', 'description', 'category', 'availability_policy', 'visibility_policy', 'owned_quantity',
-                     'owner', 'owner_group', 'storage_location', 'get_tags', 'get_properties')
-    search_fields = ('name', 'description', 'category__name', 'availability_policy', 'visibility_policy',
-                      'owner__username', 'owner_group__name', 'storage_location__name', 'tags__name',
-                      'itemproperty__property__name')
+    list_display = ('name', 'description', 'category', 'availability_policy', 'owned_quantity', 'owner',
+                     'owner_group', 'storage_location', 'get_tags', 'get_properties')
+    search_fields = ('name', 'description', 'category__name', 'availability_policy', 'owner__username',
+                      'owner_group__name', 'storage_location__name', 'tags__name', 'itemproperty__property__name')
     inlines = (ItemTagInline, ItemPropertyInline)
 
     def get_queryset(self, request):
@@ -65,10 +64,9 @@ admin.site.register(Category, CategoryAdmin)
 
 
 class StorageLocationAdmin(admin.ModelAdmin):
-    list_display = ('name', 'description', 'category', 'parent', 'owner', 'visibility_policy')
-    search_fields = ('name', 'description', 'category__name', 'parent__name', 'owner__username',
-                      'visibility_policy')
-    list_filter = ('category', 'owner', 'visibility_policy')
+    list_display = ('name', 'description', 'category', 'parent', 'owner')
+    search_fields = ('name', 'description', 'category__name', 'parent__name', 'owner__username')
+    list_filter = ('category', 'owner')
 
 
 admin.site.register(StorageLocation, StorageLocationAdmin)
diff --git a/backend/toolshed/api/idmap.py b/backend/toolshed/api/idmap.py
index d6050f9..a6451f1 100644
--- a/backend/toolshed/api/idmap.py
+++ b/backend/toolshed/api/idmap.py
@@ -43,8 +43,7 @@ def resolve_short_id(request, kind, owner_id, local_id):
         except model.DoesNotExist:
             return Response(status=404)
         is_owner = request.user.user.filter(pk=owner.pk).exists()
-        if not is_owner and (getattr(obj, 'availability_policy', 'share') == 'private'
-                              or obj.visibility_policy == 'private'):
+        if getattr(obj, 'availability_policy', 'share') == 'private' and not is_owner:
             return Response(status=403)
         return Response({'handle': f'{owner.username}@{owner.domain}', 'id': obj.id})
     if kind in ('group_item', 'group_storage_location'):
diff --git a/backend/toolshed/api/info.py b/backend/toolshed/api/info.py
index 8d9e7dd..6fc5036 100644
--- a/backend/toolshed/api/info.py
+++ b/backend/toolshed/api/info.py
@@ -46,13 +46,6 @@ def list_availability_policies(request, format=None):
     return Response(InventoryItem.AVAILABILITY_POLICY_CHOICES)
 
 
-@api_view(['GET'])
-@permission_classes([IsAuthenticated])
-@authentication_classes([SignatureAuthentication])
-def list_visibility_policies(request, format=None):
-    return Response(InventoryItem.VISIBILITY_POLICY_CHOICES)
-
-
 @api_view(['GET'])
 @permission_classes([IsAuthenticated])
 @authentication_classes([SignatureAuthentication])
@@ -61,17 +54,15 @@ def combined_info(request, format=None):
     properties = PropertySerializer(Property.objects.all(), many=True).data
     categories = [str(category) for category in Category.objects.all()]
     policies = InventoryItem.AVAILABILITY_POLICY_CHOICES
-    visibility_policies = InventoryItem.VISIBILITY_POLICY_CHOICES
     domains = [domain.name for domain in Domain.objects.filter(open_registration=True)]
     return Response(
-        {'tags': tags, 'properties': properties, 'availability_policies': policies,
-         'visibility_policies': visibility_policies, 'categories': categories, 'domains': domains})
+        {'tags': tags, 'properties': properties, 'availability_policies': policies, 'categories': categories,
+         'domains': domains})
 
 
 urlpatterns = [
 
     path('availability_policies/', list_availability_policies, name='availability_policies'),
-    path('visibility_policies/', list_visibility_policies, name='visibility_policies'),
     path('properties/', list_properties, name='propertylist'),
     path('categories/', list_categories, name='categorylist'),
     path('domains/', list_domains, name='domainlist'),
diff --git a/backend/toolshed/api/inventory.py b/backend/toolshed/api/inventory.py
index 7cc61d1..15b7eac 100644
--- a/backend/toolshed/api/inventory.py
+++ b/backend/toolshed/api/inventory.py
@@ -25,7 +25,7 @@ def inventory_items(identity):
         friend_user = friend.user.first()
         if friend_user:
             for item in friend_user.inventory_items.all():
-                if item.availability_policy != 'private' and item.visibility_policy != 'private':
+                if item.availability_policy != 'private':
                     yield item
 
 
@@ -55,7 +55,7 @@ class InventoryItemViewSet(viewsets.ModelViewSet):
                 return InventoryItem.objects.none()
             queryset = InventoryItem.objects.filter(owner=owner_user)
             if not identity.user.filter(pk=owner_user.pk).exists():
-                queryset = queryset.exclude(availability_policy='private').exclude(visibility_policy='private')
+                queryset = queryset.exclude(availability_policy='private')
         else:
             return InventoryItem.objects.none()
         # InventoryItemSerializer touches owner/owner_group/category/storage_location (FKs) and
@@ -132,7 +132,7 @@ class StorageLocationViewSet(viewsets.ModelViewSet):
     lookup_url_kwarg = 'pk'
 
     def get_queryset(self):
-        # See docs/implementation.md#owner-handle-scoped-routes; unlike items, StorageLocation has no availability_policy, but visibility_policy='private' still hides a location from friends.
+        # See docs/implementation.md#owner-handle-scoped-routes; unlike items, StorageLocation has no availability_policy, so a friend sees all of a user's locations.
         if type(self.request.user) != KnownIdentity:
             return StorageLocation.objects.none()
         identity = self.request.user
@@ -147,10 +147,7 @@ class StorageLocationViewSet(viewsets.ModelViewSet):
         if owner_user:
             if owner_user not in identity.friends_or_self():
                 return StorageLocation.objects.none()
-            queryset = StorageLocation.objects.filter(owner=owner_user)
-            if not identity.user.filter(pk=owner_user.pk).exists():
-                queryset = queryset.exclude(visibility_policy='private')
-            return queryset
+            return StorageLocation.objects.filter(owner=owner_user)
         return StorageLocation.objects.none()
 
     def perform_create(self, serializer):
diff --git a/backend/toolshed/migrations/0025_inventoryitem_visibility_policy_and_more.py b/backend/toolshed/migrations/0025_inventoryitem_visibility_policy_and_more.py
deleted file mode 100644
index e427932..0000000
--- a/backend/toolshed/migrations/0025_inventoryitem_visibility_policy_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 4.2.2 on 2026-08-31 23:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('toolshed', '0024_workflowinstance_current_step'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='inventoryitem',
-            name='visibility_policy',
-            field=models.CharField(choices=[('public', 'Public'), ('friends', 'Friends'), ('private', 'Private')], default='friends', max_length=20),
-        ),
-        migrations.AddField(
-            model_name='storagelocation',
-            name='visibility_policy',
-            field=models.CharField(choices=[('public', 'Public'), ('friends', 'Friends'), ('private', 'Private')], default='friends', max_length=20),
-        ),
-    ]
diff --git a/backend/toolshed/models.py b/backend/toolshed/models.py
index 6113f6a..65de960 100644
--- a/backend/toolshed/models.py
+++ b/backend/toolshed/models.py
@@ -107,13 +107,6 @@ class OwnerItemSequence(models.Model):
             return seq.last_id
 
 
-VISIBILITY_POLICY_CHOICES = (
-    ('public', 'Public'),
-    ('friends', 'Friends'),
-    ('private', 'Private'),
-)
-
-
 class InventoryItem(SoftDeleteModel):
     AVAILABILITY_POLICY_CHOICES = (
         ('sell', 'Sell'),
@@ -122,7 +115,6 @@ class InventoryItem(SoftDeleteModel):
         ('share', 'Share'),
         ('private', 'Private'),
     )
-    VISIBILITY_POLICY_CHOICES = VISIBILITY_POLICY_CHOICES
 
     internal_id = models.AutoField(primary_key=True)
     # Externally visible id, sequential/gapless within owner/owner_group's own items (see
@@ -133,7 +125,6 @@ class InventoryItem(SoftDeleteModel):
     description = models.TextField(null=True, blank=True)
     category = models.ForeignKey(Category, on_delete=models.CASCADE, null=True, related_name='inventory_items')
     availability_policy = models.CharField(max_length=20, choices=AVAILABILITY_POLICY_CHOICES, default='private')
-    visibility_policy = models.CharField(max_length=20, choices=VISIBILITY_POLICY_CHOICES, default='private')
     owned_quantity = models.IntegerField(default=1, validators=[MinValueValidator(0)])
     owner = models.ForeignKey(ToolshedUser, on_delete=models.CASCADE, null=True, blank=True,
                               related_name='inventory_items')
@@ -204,8 +195,6 @@ class OwnerStorageLocationSequence(models.Model):
 
 
 class StorageLocation(models.Model):
-    VISIBILITY_POLICY_CHOICES = VISIBILITY_POLICY_CHOICES
-
     internal_id = models.AutoField(primary_key=True)
     # Externally visible id, sequential/gapless within the owner/owner_group's own locations (see
     # OwnerStorageLocationSequence), never internal_id; always allocate via create_for_owner, not
@@ -220,7 +209,6 @@ class StorageLocation(models.Model):
                               related_name='storage_locations')
     owner_group = models.ForeignKey(Group, on_delete=models.CASCADE, null=True, blank=True,
                                     related_name='storage_locations')
-    visibility_policy = models.CharField(max_length=20, choices=VISIBILITY_POLICY_CHOICES, default='private')
 
     class Meta:
         constraints = [
diff --git a/backend/toolshed/offlinedata.py b/backend/toolshed/offlinedata.py
index 0f93f1e..ee9f383 100644
--- a/backend/toolshed/offlinedata.py
+++ b/backend/toolshed/offlinedata.py
@@ -24,7 +24,6 @@ def inventory_rows(user):
             'description': item.description or '',
             'category': item.category.get_handle() if item.category else '',
             'availability_policy': item.availability_policy,
-            'visibility_policy': item.visibility_policy,
             'owned_quantity': item.owned_quantity,
             'storage_location': str(item.storage_location) if item.storage_location else '',
             'tags': ', '.join(tag.get_handle() for tag in item.tags.all()),
@@ -68,7 +67,6 @@ def location_rows(user):
             'category': str(location.category) if location.category else '',
             'parent': str(location.parent) if location.parent else '',
             'path': location_path(location),
-            'visibility_policy': location.visibility_policy,
         }
 
 
@@ -344,7 +342,6 @@ def import_locations(user, data):
                 defaults = {
                     'description': row.get('description', '') or '',
                     'category': category,
-                    'visibility_policy': row.get('visibility_policy') or 'private',
                 }
                 try:
                     location = StorageLocation.objects.get(owner=user, name=name, parent=parent)
@@ -554,7 +551,6 @@ def import_inventory(user, data, available_files):
                     description=row.get('description', '') or '',
                     category=category,
                     availability_policy=row.get('availability_policy') or 'private',
-                    visibility_policy=row.get('visibility_policy') or 'private',
                     owned_quantity=owned_quantity,
                     storage_location=storage_location,
                 )
diff --git a/backend/toolshed/serializers.py b/backend/toolshed/serializers.py
index af21446..07f60b9 100644
--- a/backend/toolshed/serializers.py
+++ b/backend/toolshed/serializers.py
@@ -211,8 +211,7 @@ class StorageLocationSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = StorageLocation
-        fields = ['id', 'name', 'description', 'path', 'category', 'owner', 'owner_group', 'parent',
-                  'visibility_policy']
+        fields = ['id', 'name', 'description', 'path', 'category', 'owner', 'owner_group', 'parent']
         read_only_fields = ['id', 'path']
 
     @staticmethod
@@ -259,8 +258,7 @@ class InventoryItemSerializer(serializers.ModelSerializer):
     class Meta:
         model = InventoryItem
         fields = ['id', 'name', 'description', 'owner', 'owner_group', 'category', 'availability_policy',
-                  'visibility_policy', 'owned_quantity', 'tags', 'tags_input', 'properties', 'files',
-                  'storage_location']
+                  'owned_quantity', 'tags', 'tags_input', 'properties', 'files', 'storage_location']
         read_only_fields = ['id']
 
     def get_tags(self, obj):
diff --git a/backend/toolshed/tests/fixtures.py b/backend/toolshed/tests/fixtures.py
index 9f4e647..69c2e42 100644
--- a/backend/toolshed/tests/fixtures.py
+++ b/backend/toolshed/tests/fixtures.py
@@ -37,10 +37,10 @@ class InventoryTestMixin(CategoryTestMixin, TagTestMixin, PropertyTestMixin):
 
         self.f['item1'] = InventoryItem.create_for_owner(
             owner=self.f['local_user1'], owned_quantity=1, name='test1', description='test', category=self.f['cat1'],
-            availability_policy='friends', visibility_policy='friends')
+            availability_policy='friends')
         self.f['item2'] = InventoryItem.create_for_owner(
             owner=self.f['local_user1'], owned_quantity=1, name='test2', description='test2', category=self.f['cat1'],
-            availability_policy='friends', visibility_policy='friends')
+            availability_policy='friends')
         self.f['item2'].tags.add(self.f['tag1'], through_defaults={})
         self.f['item2'].tags.add(self.f['tag2'], through_defaults={})
         ItemProperty.objects.create(inventory_item=self.f['item2'], property=self.f['prop1'], value='value1').save()
@@ -49,14 +49,12 @@ class InventoryTestMixin(CategoryTestMixin, TagTestMixin, PropertyTestMixin):
 
 class LocationTestMixin:
     def prepare_locations(self):
-        self.f['loc1'] = StorageLocation.create_for_owner(name='loc1', owner=self.f['local_user1'],
-                                                          visibility_policy='friends')
+        self.f['loc1'] = StorageLocation.create_for_owner(name='loc1', owner=self.f['local_user1'])
         self.f['loc2'] = StorageLocation.create_for_owner(name='loc2', owner=self.f['local_user1'],
-                                                          category=self.f['cat1'], visibility_policy='friends')
-        self.f['loc3'] = StorageLocation.create_for_owner(name='loc3', owner=self.f['local_user1'], parent=self.f['loc1'],
-                                                          visibility_policy='friends')
+                                                          category=self.f['cat1'])
+        self.f['loc3'] = StorageLocation.create_for_owner(name='loc3', owner=self.f['local_user1'], parent=self.f['loc1'])
         self.f['loc4'] = StorageLocation.create_for_owner(name='loc4', owner=self.f['local_user1'], parent=self.f['loc1'],
-                                                          category=self.f['cat1'], visibility_policy='friends')
+                                                          category=self.f['cat1'])
 
 
 class WorkflowTestMixin:
diff --git a/backend/toolshed/tests/test_api.py b/backend/toolshed/tests/test_api.py
index e8b41a1..69c25df 100644
--- a/backend/toolshed/tests/test_api.py
+++ b/backend/toolshed/tests/test_api.py
@@ -46,15 +46,6 @@ class CombinedApiTestCase(UserTestMixin, CategoryTestMixin, TagTestMixin, Proper
         self.assertEqual(response.json(), [['sell', 'Sell'], ['rent', 'Rent'], ['lend', 'Lend'], ['share', 'Share'],
                                            ['private', 'Private']])
 
-    def test_visibility_policy_api_anonymous(self):
-        response = anonymous_client.get('/api/v1/visibility_policies/')
-        self.assertEqual(response.status_code, 403)
-
-    def test_visibility_policy_api(self):
-        response = client.get('/api/v1/visibility_policies/', self.f['local_user1'])
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [['public', 'Public'], ['friends', 'Friends'], ['private', 'Private']])
-
     def test_combined_api_anonymous(self):
         response = anonymous_client.get('/api/v1/info/')
         self.assertEqual(response.status_code, 403)
@@ -64,8 +55,6 @@ class CombinedApiTestCase(UserTestMixin, CategoryTestMixin, TagTestMixin, Proper
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()['availability_policies'], [['sell', 'Sell'], ['rent', 'Rent'], ['lend', 'Lend'],
                                                                     ['share', 'Share'], ['private', 'Private']])
-        self.assertEqual(response.json()['visibility_policies'],
-                         [['public', 'Public'], ['friends', 'Friends'], ['private', 'Private']])
         self.assertEqual(response.json()['categories'],
                          ['cat1', 'cat2', 'cat3', 'cat1/subcat1', 'cat1/subcat2', 'cat1/subcat1/subcat1',
                           'cat1/subcat1/subcat2'])
diff --git a/backend/toolshed/tests/test_idmap.py b/backend/toolshed/tests/test_idmap.py
index d486f84..c73335a 100644
--- a/backend/toolshed/tests/test_idmap.py
+++ b/backend/toolshed/tests/test_idmap.py
@@ -89,17 +89,6 @@ class ResolveShortIdApiTestCase(UserTestMixin, InventoryTestMixin, GroupTestMixi
                            self.f['local_user1'])
         self.assertEqual(reply.status_code, 200)
 
-    def test_resolve_item_visibility_private_not_owner(self):
-        private_item = InventoryItem.create_for_owner(
-            owner=self.f['local_user1'], owned_quantity=1, name='secret', availability_policy='friends',
-            visibility_policy='private')
-        reply = client.get(f'/api/v1/resolve_short_id/item/{self.owner_id}/{private_item.id}/',
-                           self.f['local_user2'])
-        self.assertEqual(reply.status_code, 403)
-        reply = client.get(f'/api/v1/resolve_short_id/item/{self.owner_id}/{private_item.id}/',
-                           self.f['local_user1'])
-        self.assertEqual(reply.status_code, 200)
-
     def test_resolve_item_unknown_owner(self):
         reply = client.get('/api/v1/resolve_short_id/item/999999/1/', self.f['local_user2'])
         self.assertEqual(reply.status_code, 404)
@@ -120,16 +109,6 @@ class ResolveShortIdApiTestCase(UserTestMixin, InventoryTestMixin, GroupTestMixi
         self.assertEqual(reply.status_code, 200)
         self.assertEqual(reply.json(), {'handle': 'testuser1@example.com', 'id': self.f['loc1'].id})
 
-    def test_resolve_storage_location_visibility_private_not_owner(self):
-        private_location = StorageLocation.create_for_owner(
-            owner=self.f['local_user1'], name='secret-loc', visibility_policy='private')
-        reply = client.get(f'/api/v1/resolve_short_id/storage_location/{self.owner_id}/{private_location.id}/',
-                           self.f['local_user2'])
-        self.assertEqual(reply.status_code, 403)
-        reply = client.get(f'/api/v1/resolve_short_id/storage_location/{self.owner_id}/{private_location.id}/',
-                           self.f['local_user1'])
-        self.assertEqual(reply.status_code, 200)
-
     def test_resolve_storage_location_unknown_local_id(self):
         reply = client.get(f'/api/v1/resolve_short_id/storage_location/{self.owner_id}/999999/',
                            self.f['local_user1'])
diff --git a/backend/toolshed/tests/test_inventory.py b/backend/toolshed/tests/test_inventory.py
index 8a08b49..162d7c5 100644
--- a/backend/toolshed/tests/test_inventory.py
+++ b/backend/toolshed/tests/test_inventory.py
@@ -205,15 +205,6 @@ class InventoryApiTestCase(UserTestMixin, InventoryTestMixin, ToolshedTestCase):
         self.assertEqual(reply.json()[0]['name'], 'test1')
         self.assertEqual(reply.json()[1]['name'], 'test2')
 
-    def test_search_items_excludes_visibility_private(self):
-        InventoryItem.create_for_owner(
-            owner=self.f['local_user1'], owned_quantity=1, name='test-secret', availability_policy='friends',
-            visibility_policy='private')
-        reply = client.get('/api/v1/search/?query=test', self.f['local_user2'])
-        self.assertEqual(reply.status_code, 200)
-        self.assertEqual(len(reply.json()), 2)
-        self.assertNotIn('test-secret', [item['name'] for item in reply.json()])
-
     def test_search_items_fail(self):
         reply = client.get('/api/v1/search/', self.f['local_user1'])
         self.assertEqual(reply.status_code, 400)
@@ -255,17 +246,6 @@ class InventoryApiTestCase(UserTestMixin, InventoryTestMixin, ToolshedTestCase):
                            self.f['local_user1'])
         self.assertEqual(reply.status_code, 200)
 
-    def test_get_shared_item_visibility_private(self):
-        private_item = InventoryItem.create_for_owner(
-            owner=self.f['local_user1'], owned_quantity=1, name='secret', availability_policy='friends',
-            visibility_policy='private')
-        reply = client.get('/api/v1/inventory_items/testuser1@example.com/' + str(private_item.id) + '/',
-                           self.f['local_user2'])
-        self.assertEqual(reply.status_code, 404)
-        reply = client.get('/api/v1/inventory_items/testuser1@example.com/' + str(private_item.id) + '/',
-                           self.f['local_user1'])
-        self.assertEqual(reply.status_code, 200)
-
     def test_get_shared_item_unknown_handle(self):
         reply = client.get('/api/v1/inventory_items/nobody@example.com/' + str(self.f['item1'].id) + '/',
                            self.f['local_user2'])
diff --git a/backend/toolshed/tests/test_locations.py b/backend/toolshed/tests/test_locations.py
index 5c1ab75..c6d84b4 100644
--- a/backend/toolshed/tests/test_locations.py
+++ b/backend/toolshed/tests/test_locations.py
@@ -128,23 +128,6 @@ class LocationApiTestCase(UserTestMixin, InventoryTestMixin, LocationTestMixin,
         self.assertEqual(reply.status_code, 200)
         self.assertEqual(len(reply.json()), 0)
 
-    def test_get_shared_location_visibility_private(self):
-        private_location = StorageLocation.create_for_owner(
-            owner=self.f['local_user1'], name='secret-loc', visibility_policy='private')
-        reply = client.get(
-            '/api/v1/storage_locations/{}/{}/'.format(self.own_handle, private_location.id), self.f['local_user2'])
-        self.assertEqual(reply.status_code, 404)
-        reply = client.get(
-            '/api/v1/storage_locations/{}/{}/'.format(self.own_handle, private_location.id), self.f['local_user1'])
-        self.assertEqual(reply.status_code, 200)
-
-    def test_list_locations_excludes_visibility_private_for_friend(self):
-        StorageLocation.create_for_owner(owner=self.f['local_user1'], name='secret-loc', visibility_policy='private')
-        reply = client.get('/api/v1/storage_locations/{}/'.format(self.own_handle), self.f['local_user2'])
-        self.assertEqual(reply.status_code, 200)
-        self.assertEqual(len(reply.json()), 4)
-        self.assertNotIn('secret-loc', [loc['name'] for loc in reply.json()])
-
     def test_cannot_delete_other_users_location(self):
         # local_user2 is a friend of local_user1 (see prepare_inventory), so local_user1's own
         # handle resolves and the location is visible - friends can read but never write, so this
diff --git a/backend/toolshed/tests/test_offlinedata.py b/backend/toolshed/tests/test_offlinedata.py
index c558fa4..8a5a732 100644
--- a/backend/toolshed/tests/test_offlinedata.py
+++ b/backend/toolshed/tests/test_offlinedata.py
@@ -233,7 +233,7 @@ class ExportImportApiRoundTripTestCase(UserTestMixin, CategoryTestMixin, TagTest
 
         item = InventoryItem.create_for_owner(
             owner=self.f['local_user1'], name='drill', description='cordless drill',
-            category=self.f['cat1'], availability_policy='friends', visibility_policy='public', owned_quantity=2)
+            category=self.f['cat1'], availability_policy='friends', owned_quantity=2)
         item.tags.add(self.f['tag1'], self.f['tag2'], through_defaults={})
         ItemProperty.objects.create(inventory_item=item, property=self.f['prop1'], value='10cm, 20cm')
         ItemProperty.objects.create(inventory_item=item, property=self.f['prop2'], value='a=b')
@@ -251,7 +251,6 @@ class ExportImportApiRoundTripTestCase(UserTestMixin, CategoryTestMixin, TagTest
 
         new_item = InventoryItem.objects.get(owner=self.f['local_user2'], name='drill')
         self.assertEqual(new_item.category, self.f['cat1'])
-        self.assertEqual(new_item.visibility_policy, 'public')
         self.assertEqual(sorted(t.name for t in new_item.tags.all()), ['tag1', 'tag2'])
 
         values = {ip.property.name: ip.value for ip in new_item.itemproperty_set.select_related('property')}
diff --git a/frontend/src/components/workflow/workflows/FotoFirstBulkImportWorkflow.vue b/frontend/src/components/workflow/workflows/FotoFirstBulkImportWorkflow.vue
index cc20c9c..1998a36 100644
--- a/frontend/src/components/workflow/workflows/FotoFirstBulkImportWorkflow.vue
+++ b/frontend/src/components/workflow/workflows/FotoFirstBulkImportWorkflow.vue
@@ -98,7 +98,6 @@
                         <label class="form-label fw-bold">{{ field.label }}</label>
                         <field-input :type="field.type" v-model="presetValues[field.key]"
                                      :owner-groups="ownerGroups" :availability-policies="availability_policies"
-                                     :visibility-policies="visibility_policies"
                                      :storage-locations="storage_locations"/>
                     </div>
                 </div>
@@ -188,7 +187,6 @@
                                         <field-input :type="field.type" v-model="currentItemDetails[field.key]"
                                                      :owner-groups="ownerGroups"
                                                      :availability-policies="availability_policies"
-                                                     :visibility-policies="visibility_policies"
                                                      :storage-locations="storage_locations"/>
                                     </div>
                                 </form>
@@ -295,7 +293,6 @@ const PRESET_FIELD_DEFS = [
     {key: 'owner_group', label: 'Owner', type: 'owner_group'},
     {key: 'owned_quantity', label: 'Quantity', type: 'number'},
     {key: 'availability_policy', label: 'Availability Policy', type: 'availability_policy'},
-    {key: 'visibility_policy', label: 'Visibility Policy', type: 'visibility_policy'},
     {key: 'storage_location', label: 'Storage Location', type: 'storage_location'}
 ];
 
@@ -310,7 +307,6 @@ function defaultValueFor(key) {
         case 'owned_quantity':
             return 1;
         case 'availability_policy':
-        case 'visibility_policy':
             return 'private';
         default:
             return '';
@@ -394,7 +390,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(['user', 'availability_policies', 'visibility_policies', 'storage_locations', 'groups', 'groupMemberships']),
+        ...mapState(['user', 'availability_policies', 'storage_locations', 'groups', 'groupMemberships']),
         ownerGroups() {
             const hostedHandles = new Set(this.groups.map(group => group.handle));
             const foreign = this.groupMemberships.filter(m => !hostedHandles.has(m.handle));
@@ -623,7 +619,6 @@ export default {
                 properties: details.properties,
                 owned_quantity: details.owned_quantity,
                 availability_policy: details.availability_policy,
-                visibility_policy: details.visibility_policy,
                 storage_location: details.storage_location,
                 owner_group: details.owner_group
             });
diff --git a/frontend/src/components/workflow/workflows/FotoFirstFieldInput.vue b/frontend/src/components/workflow/workflows/FotoFirstFieldInput.vue
index 206c9a4..3f8291e 100644
--- a/frontend/src/components/workflow/workflows/FotoFirstFieldInput.vue
+++ b/frontend/src/components/workflow/workflows/FotoFirstFieldInput.vue
@@ -20,12 +20,6 @@
         </option>
     </select>
 
-    <select v-else-if="type === 'visibility_policy'" class="form-select" v-model="localValue">
-        <option v-for="policy in visibilityPolicies" :key="policy.slug" :value="policy.slug">
-            {{ policy.text }}
-        </option>
-    </select>
-
     <select v-else-if="type === 'storage_location'" class="form-select" v-model="localValue">
         <option :value="null">No storage location</option>
         <option v-for="location in storageLocations" :key="location.id" :value="location.id">
@@ -59,10 +53,6 @@ export default {
             type: Array,
             default: () => []
         },
-        visibilityPolicies: {
-            type: Array,
-            default: () => []
-        },
         storageLocations: {
             type: Array,
             default: () => []
diff --git a/frontend/src/label-layouts.js b/frontend/src/label-layouts.js
index 94d6413..1e49d8a 100644
--- a/frontend/src/label-layouts.js
+++ b/frontend/src/label-layouts.js
@@ -65,15 +65,6 @@ export const LABEL_TEMPLATES = [
             content: c => c.id?.toString().padStart(4, "0")
         }]
     },
-    {
-        id: "mqr-token-id", name: "MQR Token + ID",
-        description: "The code encoding the internal short id, with the id printed alongside for a human to read.",
-        required_vars: ["shortId", "id"], tags: ["internal"],
-        layout: [{type: "rmqr", content: c => c.shortId}, {
-            type: "text",
-            content: c => c.typedPrefix?.toUpperCase() + c.id?.toString().padStart(4, "0")
-        }]
-    },
     {
         id: "domain-short-id-qr", name: "Any-Instance Token (QR)",
         description: "The code encoding the domain-qualified short id (domain:~token) - resolvable "
diff --git a/frontend/src/store.js b/frontend/src/store.js
index b35e813..69f6381 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -42,7 +42,6 @@ export default createStore({
         files: [],
         categories: [],
         availability_policies: [],
-        visibility_policies: [],
         domains: [],
         storage_locations: [],
         active_workflows: [],
@@ -101,9 +100,6 @@ export default createStore({
         setAvailabilityPolicies(state, availability_policies) {
             state.availability_policies = availability_policies;
         },
-        setVisibilityPolicies(state, visibility_policies) {
-            state.visibility_policies = visibility_policies;
-        },
         setDomains(state, domains) {
             state.domains = domains;
         },
@@ -347,7 +343,7 @@ export default createStore({
                 ? await dispatch('getFriendServers', {username: 'x@' + splitGroupHandle(item.owner_group).domain})
                 : await dispatch('getHomeServers')
             const owner = item.owner_group ? encodeHandleForUrl(item.owner_group) : state.user
-            const data = {availability_policy: 'private', visibility_policy: 'private', ...item}
+            const data = {availability_policy: 'private', ...item}
             delete data.owner_group
             const reply = await servers.post(getters.signAuth, '/api/v1/inventory_items/' + owner + '/', data)
             state.last_load.files = 0
@@ -357,7 +353,7 @@ export default createStore({
             const servers = item.owner_group
                 ? await dispatch('getFriendServers', {username: 'x@' + splitGroupHandle(item.owner_group).domain})
                 : await dispatch('getHomeServers')
-            const data = {availability_policy: 'friends', visibility_policy: 'friends', ...item}
+            const data = {availability_policy: 'friends', ...item}
             data.files = data.files.map(file => file.id)
             // Path is scoped by the owner's handle, not the item's own id domain - see docs/implementation.md#owner-handle-scoped-routes.
             const path = '/api/v1/inventory_items/' + encodeHandleForUrl(item.owner_group || item.owner) + '/' + item.id + '/'
@@ -665,16 +661,6 @@ export default createStore({
             state.last_load.availability_policies = Date.now()
             return data
         },
-        async fetchVisibilityPolicies({state, commit, dispatch, getters}) {
-            if (state.last_load.visibility_policies > Date.now() - 1000 * 60 * 60 * 24) {
-                return state.visibility_policies
-            }
-            const servers = await dispatch('getHomeServers')
-            const data = await servers.get(getters.signAuth, '/api/v1/visibility_policies/')
-            commit('setVisibilityPolicies', data.map(policy => ({slug: policy[0], text: policy[1]})))
-            state.last_load.visibility_policies = Date.now()
-            return data
-        },
         async fetchStorageLocations({state, commit, dispatch, getters}) {
             if (state.last_load.storage_locations > Date.now() - 1000 * 60 * 60 * 24) {
                 return state.storage_locations
@@ -748,8 +734,7 @@ export default createStore({
                 state.last_load.tags,
                 state.last_load.properties,
                 state.last_load.categories,
-                state.last_load.availability_policies,
-                state.last_load.visibility_policies)
+                state.last_load.availability_policies)
             if (last_load_info > Date.now() - 1000 * 60 * 60 * 24) {
                 return state.info
             }
@@ -762,16 +747,11 @@ export default createStore({
                 slug: policy[0],
                 text: policy[1]
             })))
-            commit('setVisibilityPolicies', data.visibility_policies.map(policy => ({
-                slug: policy[0],
-                text: policy[1]
-            })))
             commit('setDomains', data.domains)
             state.last_load.tags = Date.now()
             state.last_load.properties = Date.now()
             state.last_load.categories = Date.now()
             state.last_load.availability_policies = Date.now()
-            state.last_load.visibility_policies = Date.now()
             return data
         },
         async userIdentityRecord({state}, {password}) {
diff --git a/frontend/src/views/Admin.vue b/frontend/src/views/Admin.vue
index e1751de..53ff1ba 100644
--- a/frontend/src/views/Admin.vue
+++ b/frontend/src/views/Admin.vue
@@ -67,18 +67,6 @@
                                 </ul>
                             </div>
                         </div>
-                        <div class="card">
-                            <div class="card-header">
-                                <h5 class="card-title">Visibility Policies</h5>
-                            </div>
-                            <div class="card-body">
-                                <ul>
-                                    <li v-for="policy in visibility_policies.sort()" :key="policy.id">
-                                        {{ policy.text }}
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
                         <div class="card">
                             <div class="card-header">
                                 <h5 class="card-title">Storage Locations</h5>
@@ -110,7 +98,7 @@ export default {
         ...BIcons
     },
     computed: {
-        ...mapState(["tags", "properties", "categories", "availability_policies", "visibility_policies", "domains", "storage_locations"])
+        ...mapState(["tags", "properties", "categories", "availability_policies", "domains", "storage_locations"])
     },
     methods: {
         ...mapActions(["fetchInfo", "fetchStorageLocations"])
diff --git a/frontend/src/views/Inventory.vue b/frontend/src/views/Inventory.vue
index 6ff5a6c..7f2243a 100644
--- a/frontend/src/views/Inventory.vue
+++ b/frontend/src/views/Inventory.vue
@@ -35,9 +35,8 @@
                             <table class="table table-striped" v-if="layout === 'table'">
                                 <thead>
                                 <tr>
-                                    <th style="width:35%;">Name</th>
-                                    <th style="width:20%">Availability Policy</th>
-                                    <th style="width:20%">Visibility Policy</th>
+                                    <th style="width:40%;">Name</th>
+                                    <th style="width:25%">Availability Policy</th>
                                     <th class="d-none d-md-table-cell" style="width:25%">Amount</th>
                                     <th>Actions</th>
                                 </tr>
@@ -50,9 +49,6 @@
                                     <td class="d-none d-md-table-cell">
                                         <span class="badge bg-secondary text-white">{{ item.availability_policy }}</span>
                                     </td>
-                                    <td class="d-none d-md-table-cell">
-                                        <span class="badge bg-secondary text-white">{{ item.visibility_policy }}</span>
-                                    </td>
                                     <td class="d-none d-md-table-cell">{{ item.owned_quantity }}</td>
                                     <td class="table-action">
                                         <router-link v-if="canEdit" :to="`${itemRoute(item)}/edit`">
@@ -88,7 +84,6 @@
                                                     </router-link></h5>
                                                 <div class="card-text text-black-50">
                                                     <span class="badge bg-secondary text-white">{{ item.availability_policy }}</span>
-                                                    <span class="badge bg-secondary text-white">{{ item.visibility_policy }}</span>
                                                     <span class="float-right">{{ item.owned_quantity }}</span>
                                                 </div>
                                                 <div class="btn-group">
diff --git a/frontend/src/views/InventoryEdit.vue b/frontend/src/views/InventoryEdit.vue
index 374ae91..d539c84 100644
--- a/frontend/src/views/InventoryEdit.vue
+++ b/frontend/src/views/InventoryEdit.vue
@@ -39,16 +39,6 @@
                                     </option>
                                 </select>
                             </div>
-                            <div class="mb-3">
-                                <label for="visibility_policy" class="form-label">Visibility Policy</label>
-                                <select class="form-select" id="visibility_policy" name="visibility_policy"
-                                        v-model="item.visibility_policy">
-                                    <option v-for="policy in visibility_policies" :value="policy.slug"
-                                            :selected="policy.slug === item.visibility_policy">
-                                        {{ policy.text }}
-                                    </option>
-                                </select>
-                            </div>
                             <div class="mb-3">
                                 <label for="storage_location" class="form-label">Storage Location</label>
                                 <select class="form-select" id="storage_location" name="storage_location"
@@ -125,7 +115,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(["availability_policies", "visibility_policies", "storage_locations"]),
+        ...mapState(["availability_policies", "storage_locations"]),
         decodedHandle() {
             return decodeHandleFromUrl(this.handle)
         }
diff --git a/frontend/src/views/InventoryNew.vue b/frontend/src/views/InventoryNew.vue
index 76799a5..a6e78b8 100644
--- a/frontend/src/views/InventoryNew.vue
+++ b/frontend/src/views/InventoryNew.vue
@@ -48,16 +48,6 @@
                                     </option>
                                 </select>
                             </div>
-                            <div class="mb-3">
-                                <label for="visibility_policy" class="form-label">Visibility Policy</label>
-                                <select class="form-select" id="visibility_policy" name="visibility_policy"
-                                        v-model="item.visibility_policy">
-                                    <option v-for="policy in visibility_policies" :value="policy.slug"
-                                            :selected="policy.slug === item.visibility_policy">
-                                        {{ policy.text }}
-                                    </option>
-                                </select>
-                            </div>
                             <div class="mb-3">
                                 <label for="storage_location" class="form-label">Storage Location</label>
                                 <select class="form-select" id="storage_location" name="storage_location"
@@ -119,7 +109,6 @@ export default {
                 description: "",
                 owned_quantity: 0,
                 availability_policy: "",
-                visibility_policy: "",
                 image: "",
                 tags: [],
                 properties: [],
@@ -137,7 +126,7 @@ export default {
             'fetchGroupMemberships'])
     },
     computed: {
-        ...mapState(["availability_policies", "visibility_policies", "storage_locations", "groups", "groupMemberships"]),
+        ...mapState(["availability_policies", "storage_locations", "groups", "groupMemberships"]),
         // Groups hosted here plus groups only known via a GroupMembership pointer (see
         // Groups.vue's allGroups for the same merge/dedupe).
         ownerGroups() {
diff --git a/frontend/src/views/StorageLocation.vue b/frontend/src/views/StorageLocation.vue
index 27c98b2..b19db27 100644
--- a/frontend/src/views/StorageLocation.vue
+++ b/frontend/src/views/StorageLocation.vue
@@ -32,10 +32,9 @@
                             <table class="table table-striped" v-if="layout === 'table'">
                                 <thead>
                                 <tr>
-                                    <th style="width:35%;">Name</th>
-                                    <th style="width:20%">Path</th>
-                                    <th class="d-none d-md-table-cell" style="width:20%">Category</th>
-                                    <th class="d-none d-md-table-cell" style="width:20%">Visibility Policy</th>
+                                    <th style="width:40%;">Name</th>
+                                    <th style="width:25%">Path</th>
+                                    <th class="d-none d-md-table-cell" style="width:25%">Category</th>
                                     <th>Actions</th>
                                 </tr>
                                 </thead>
@@ -51,9 +50,6 @@
                                         <span class="badge bg-info text-white" v-if="location.category">{{ location.category }}</span>
                                         <span class="text-muted" v-else>-</span>
                                     </td>
-                                    <td class="d-none d-md-table-cell">
-                                        <span class="badge bg-secondary text-white">{{ location.visibility_policy }}</span>
-                                    </td>
                                     <td class="table-action">
                                         <router-link :to="`${locationRoute(location)}/edit`">
                                             <b-icon-pencil-square></b-icon-pencil-square>
@@ -85,7 +81,6 @@
                                                 <div class="card-text text-black-50">
                                                     <small class="text-muted d-block">{{ location.path }}</small>
                                                     <span class="badge bg-info text-white" v-if="location.category">{{ location.category }}</span>
-                                                    <span class="badge bg-secondary text-white">{{ location.visibility_policy }}</span>
                                                 </div>
                                                 <div class="card-text" v-if="location.description">
                                                     <small>{{ location.description }}</small>
diff --git a/frontend/src/views/StorageLocationDetail.vue b/frontend/src/views/StorageLocationDetail.vue
index 9c7fb62..ff010fe 100644
--- a/frontend/src/views/StorageLocationDetail.vue
+++ b/frontend/src/views/StorageLocationDetail.vue
@@ -25,12 +25,6 @@
                                 <label for="owner" class="form-label">Owner</label>
                                 <div>{{ location.owner || location.owner_group || '-' }}</div>
                             </div>
-                            <div class="mb-3">
-                                <label for="visibility_policy" class="form-label">Visibility Policy</label>
-                                <div>
-                                    <span class="badge bg-secondary text-white">{{ location.visibility_policy }}</span>
-                                </div>
-                            </div>
                         </div>
                     </div>
                     <div class="card" v-if="canEdit">
diff --git a/frontend/src/views/StorageLocationEdit.vue b/frontend/src/views/StorageLocationEdit.vue
index 4dee857..d89014c 100644
--- a/frontend/src/views/StorageLocationEdit.vue
+++ b/frontend/src/views/StorageLocationEdit.vue
@@ -38,16 +38,6 @@
                                     </option>
                                 </select>
                             </div>
-                            <div class="mb-3">
-                                <label for="visibility_policy" class="form-label">Visibility Policy</label>
-                                <select class="form-select" id="visibility_policy" name="visibility_policy"
-                                        v-model="location.visibility_policy">
-                                    <option v-for="policy in visibility_policies" :value="policy.slug"
-                                            :selected="policy.slug === location.visibility_policy">
-                                        {{ policy.text }}
-                                    </option>
-                                </select>
-                            </div>
                             <div class="mb-3">
                                 <button type="submit" class="btn btn-primary" style="width: 100%"
                                         @click="submitForm()">Update
@@ -90,7 +80,6 @@ export default {
                 description: "",
                 category: null,
                 parent: null,
-                visibility_policy: "private",
             },
             // The location's own owner's full location list, for the parent dropdown - own
             // personal locations, or the owning group's own (see loadLocation).
@@ -98,7 +87,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(["categories", "visibility_policies"]),
+        ...mapState(["categories"]),
         decodedHandle() {
             return decodeHandleFromUrl(this.handle)
         },
diff --git a/frontend/src/views/StorageLocationNew.vue b/frontend/src/views/StorageLocationNew.vue
index f004bb1..c159f0f 100644
--- a/frontend/src/views/StorageLocationNew.vue
+++ b/frontend/src/views/StorageLocationNew.vue
@@ -45,16 +45,6 @@
                                     </option>
                                 </select>
                             </div>
-                            <div class="mb-3">
-                                <label for="visibility_policy" class="form-label">Visibility Policy</label>
-                                <select class="form-select" id="visibility_policy" name="visibility_policy"
-                                        v-model="location.visibility_policy">
-                                    <option v-for="policy in visibility_policies" :value="policy.slug"
-                                            :selected="policy.slug === location.visibility_policy">
-                                        {{ policy.text }}
-                                    </option>
-                                </select>
-                            </div>
                             <div class="mb-3">
                                 <button type="submit" class="btn btn-primary" style="width: 100%"
                                         @click="submitForm()">Add
@@ -94,7 +84,6 @@ export default {
                 description: "",
                 category: null,
                 parent: null,
-                visibility_policy: "private",
                 // The group's own "#name@domain" handle once picked, or null for a personal
                 // location - createStorageLocation resolves the target domain from it directly.
                 owner_group: null
@@ -126,7 +115,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(["categories", "visibility_policies", "storage_locations", "groups", "groupMemberships"]),
+        ...mapState(["categories", "storage_locations", "groups", "groupMemberships"]),
         // Groups hosted here plus groups only known via a GroupMembership pointer (see
         // Groups.vue's allGroups for the same merge/dedupe).
         ownerGroups() {
diff --git a/testdata/generate_testdata.py b/testdata/generate_testdata.py
index 05379fd..502c954 100644
--- a/testdata/generate_testdata.py
+++ b/testdata/generate_testdata.py
@@ -280,7 +280,6 @@ def generate_locations_csv(count):
             'category': '',
             'parent': '',
             'path': name,
-            'visibility_policy': 'friends',
         })
 
     # Second pass: create remaining locations, some as children
@@ -303,13 +302,12 @@ def generate_locations_csv(count):
             'category': '',
             'parent': parent_id,
             'path': path,
-            'visibility_policy': 'friends',
         })
         location_id_map[name] = str(current_id)
         current_id += 1
 
     output = io.StringIO()
-    fieldnames = ['id', 'name', 'description', 'category', 'parent', 'path', 'visibility_policy']
+    fieldnames = ['id', 'name', 'description', 'category', 'parent', 'path']
     writer = csv.DictWriter(output, fieldnames=fieldnames)
     writer.writeheader()
     writer.writerows(rows)
@@ -388,7 +386,6 @@ def generate_inventory_csv(count, num_locations, location_id_map, item_range=Non
             'description': description,
             'category': category_handle,
             'availability_policy': policy,
-            'visibility_policy': 'friends',
             'owned_quantity': str(qty),
             'storage_location': location,
             'tags': ', '.join(tags_for_item),
@@ -398,7 +395,7 @@ def generate_inventory_csv(count, num_locations, location_id_map, item_range=Non
         })
 
     output = io.StringIO()
-    fieldnames = ['id', 'name', 'description', 'category', 'availability_policy', 'visibility_policy',
+    fieldnames = ['id', 'name', 'description', 'category', 'availability_policy',
                   'owned_quantity', 'storage_location', 'tags', 'properties', 'files', 'created_at']
     writer = csv.DictWriter(output, fieldnames=fieldnames)
     writer.writeheader()