No need for clustering in release versions