Bugfix: prune user buckets

Fixes #798.