A bit of card_controller cleanup