Some card_controller cleanup