BucketList clean up almost complete