match arm cleanup