Cleanup
Fix data collection from Bucketed