s3-cluster remove more CLUSTER_SUPPORT #ifdef stuff