Add DeleteBucket and clean up