Remove CountBucket because it never be used