Remove dynamic bucket

Follow-on from #1767