removed 'cluster' logic from Joint