Remove KeySet/KeyBag, deprecated > 1 year ago