Cleaning up the bucket brigade