Follow-up to 751fe0e1: remove dead code, group related code.