Added the whole bucket removal