Update auth cleanup to handle sharded cluster configuration