[faad2] Group clean-up