Packing up clean-up buckets

Packing cleanup buckets for CWS