diff --git a/headers/private/storage/DiskSystemAddOn.h b/headers/private/storage/DiskSystemAddOn.h
index 7d773fba78..6792777447 100644
--- a/headers/private/storage/DiskSystemAddOn.h
+++ b/headers/private/storage/DiskSystemAddOn.h
@@ -19,12 +19,10 @@ class BPartitioningInfo;
 
 class BDiskSystemAddOn {
 public:
-								BDiskSystemAddOn(const char* name,
-									uint32 flags);
+								BDiskSystemAddOn(const char* name);
 	virtual						~BDiskSystemAddOn();
 
 			const char*			Name() const;
-			uint32				Flags() const;
 
 	virtual	status_t			CreatePartitionHandle(
 									BMutablePartition* partition,
@@ -48,7 +46,6 @@ public:
 
 private:
 			BString				fName;
-			uint32				fFlags;
 };
 
 
diff --git a/src/add-ons/disk_systems/bfs/BFSAddOn.cpp b/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
index 41b8d3e9ee..cb718e0908 100644
--- a/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
+++ b/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
@@ -71,7 +71,7 @@ size_string(double size)
 
 
 BFSAddOn::BFSAddOn()
-	: BDiskSystemAddOn(kPartitionTypeBFS, kDiskSystemFlags)
+	: BDiskSystemAddOn(kPartitionTypeBFS)
 {
 }
 
diff --git a/src/add-ons/disk_systems/fat/FATAddOn.cpp b/src/add-ons/disk_systems/fat/FATAddOn.cpp
index 2e64b67adf..6bf15412c9 100644
--- a/src/add-ons/disk_systems/fat/FATAddOn.cpp
+++ b/src/add-ons/disk_systems/fat/FATAddOn.cpp
@@ -43,7 +43,7 @@ static const uint32 kDiskSystemFlags =
 #define TRACE printf
 
 FATAddOn::FATAddOn()
-	: BDiskSystemAddOn(kPartitionTypeFAT32, kDiskSystemFlags)
+	: BDiskSystemAddOn(kPartitionTypeFAT32)
 {
 }
 
diff --git a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp
index f0ac78d925..4aa170960a 100644
--- a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp
+++ b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp
@@ -32,34 +32,12 @@
 #endif
 
 
-static const uint32 kDiskSystemFlags =
-	0
-//	| B_DISK_SYSTEM_SUPPORTS_CHECKING
-//	| B_DISK_SYSTEM_SUPPORTS_REPAIRING
-//	| B_DISK_SYSTEM_SUPPORTS_RESIZING
-//	| B_DISK_SYSTEM_SUPPORTS_MOVING
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
-//	| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
-
-//	| B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_SETTING_NAME
-	| B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_NAME
-;
-
-
 // #pragma mark - GPTDiskAddOn
 
 
 GPTDiskAddOn::GPTDiskAddOn()
 	:
-	BDiskSystemAddOn(EFI_PARTITION_NAME, kDiskSystemFlags)
+	BDiskSystemAddOn(EFI_PARTITION_NAME)
 {
 }
 
diff --git a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
index deb657d559..9b0096720a 100644
--- a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
+++ b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
@@ -32,34 +32,12 @@
 using std::nothrow;
 
 
-static const uint32 kDiskSystemFlags =
-	0
-//	| B_DISK_SYSTEM_SUPPORTS_CHECKING
-//	| B_DISK_SYSTEM_SUPPORTS_REPAIRING
-//	| B_DISK_SYSTEM_SUPPORTS_RESIZING
-//	| B_DISK_SYSTEM_SUPPORTS_MOVING
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
-//	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
-//	| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
-
-//	| B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_NAME
-	| B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_NAME
-;
-
-
 // #pragma mark - ExtendedPartitionAddOn
 
 
 ExtendedPartitionAddOn::ExtendedPartitionAddOn()
 	:
-	BDiskSystemAddOn(kPartitionTypeIntelExtended, kDiskSystemFlags)
+	BDiskSystemAddOn(kPartitionTypeIntelExtended)
 {
 }
 
diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
index 67cf50684b..aefc329571 100644
--- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
+++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
@@ -31,34 +31,12 @@
 using std::nothrow;
 
 
-static const uint32 kDiskSystemFlags =
-	0
-//	| B_DISK_SYSTEM_SUPPORTS_CHECKING
-//	| B_DISK_SYSTEM_SUPPORTS_REPAIRING
-	| B_DISK_SYSTEM_SUPPORTS_RESIZING
-	| B_DISK_SYSTEM_SUPPORTS_MOVING
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME
-	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
-//	| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
-
-	| B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_NAME
-	| B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE
-//	| B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD
-	| B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD
-//	| B_DISK_SYSTEM_SUPPORTS_NAME
-;
-
-
 // #pragma mark - PartitionMapAddOn
 
 
 PartitionMapAddOn::PartitionMapAddOn()
 	:
-	BDiskSystemAddOn(kPartitionTypeIntel, kDiskSystemFlags)
+	BDiskSystemAddOn(kPartitionTypeIntel)
 {
 }
 
diff --git a/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp b/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
index 3c3901dcb3..566b948f4e 100644
--- a/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
+++ b/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
@@ -43,8 +43,9 @@ static const uint32 kDiskSystemFlags =
 
 #define TRACE printf
 
+
 NTFSAddOn::NTFSAddOn()
-	: BDiskSystemAddOn(kPartitionTypeNTFS, kDiskSystemFlags)
+	: BDiskSystemAddOn(kPartitionTypeNTFS)
 {
 }
 
diff --git a/src/kits/storage/disk_device/DiskSystemAddOn.cpp b/src/kits/storage/disk_device/DiskSystemAddOn.cpp
index 73171be714..bbd668444a 100644
--- a/src/kits/storage/disk_device/DiskSystemAddOn.cpp
+++ b/src/kits/storage/disk_device/DiskSystemAddOn.cpp
@@ -12,10 +12,9 @@
 // #pragma mark - BDiskSystemAddOn
 
 
-BDiskSystemAddOn::BDiskSystemAddOn(const char* name, uint32 flags)
+BDiskSystemAddOn::BDiskSystemAddOn(const char* name)
 	:
-	fName(name),
-	fFlags(flags)
+	fName(name)
 {
 }
 
@@ -32,13 +31,6 @@ BDiskSystemAddOn::Name() const
 }
 
 
-uint32
-BDiskSystemAddOn::Flags() const
-{
-	return fFlags;
-}
-
-
 bool
 BDiskSystemAddOn::CanInitialize(const BMutablePartition* partition)
 {