Teran-buckets

CLEAN-UP SKELETON BUCKETS