Let Vanilla handle filling buckets for default value
Misc. Cleanup
A bit more cleanup