Decrease uses of buckets