Revert "TwentyOneCard and adjusting Deck for the new Card type"

This reverts commit 18e7d3be12045c10999ca2878f6141c55d3df866.