diff --git a/TODO b/TODO
index 5550586f9d138961a1469bc65f2b6e39503ddef5..aa50ec980245154a0557effe2270f72370eafef8 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,5 @@
 RC = Release Critical (for next release)
 
-  General
-RC  - Don't provide a default cluster name in configuration
-      To avoid lazy admin naming 2 clusters on the same net with the same name
-
   Documentation
     - Clarify node state signification, and consider renaming them in the code.
       Ideas:
diff --git a/neo.conf b/neo.conf
index 759d2b50635b7e1f00ded34218b9f9a89bdb9eec..927f3a80094f4b01d065917b04a2d6bfa69c2bef 100644
--- a/neo.conf
+++ b/neo.conf
@@ -1,7 +1,7 @@
 # Default parameters.
 [DEFAULT]
 # The cluster name
-name: main
+name: 
 # The list of master nodes.
 master_nodes: 127.0.0.1:10010 127.0.0.1:10011
 # Partition table configuration