more cleanup of cards