remove code for dynamic clustering (too slow)