Remove more card lib dependencies.