Goodbye extra bottle classes. Next: buckets.