serf: implement remove-key, consolidate like code