remove bucket checking